allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hei...@apache.org
Subject allura git commit: [#7894] Merge request timestamps are no longer updated incorrectly
Date Mon, 15 Jun 2015 20:33:24 GMT
Repository: allura
Updated Branches:
  refs/heads/hs/7894 [created] b1c40fe48


[#7894] Merge request timestamps are no longer updated incorrectly


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/b1c40fe4
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/b1c40fe4
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/b1c40fe4

Branch: refs/heads/hs/7894
Commit: b1c40fe4800460328b7a2dd55b86e01d8deb78f6
Parents: 195c0b1
Author: Heith Seewald <hseewald@slashdotmedia.com>
Authored: Mon Jun 15 16:33:06 2015 -0400
Committer: Heith Seewald <hseewald@slashdotmedia.com>
Committed: Mon Jun 15 16:33:06 2015 -0400

----------------------------------------------------------------------
 Allura/allura/model/repository.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/b1c40fe4/Allura/allura/model/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index 022343f..bdd2399 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -56,7 +56,8 @@ from .timeline import ActivityObject
 from .monq_model import MonQTask
 from .project import AppConfig
 from .session import main_doc_session
-from .session import repository_orm_session
+from .session import repository_orm_session, artifact_orm_session
+
 
 log = logging.getLogger(__name__)
 config = utils.ConfigProxy(
@@ -829,6 +830,9 @@ class MergeRequest(VersionedArtifact, ActivityObject):
             return False
         if self.app.config.options.get('merge_disabled'):
             return False
+
+        _session = artifact_orm_session._get()
+        _session.skip_mod_date = True
         return True
 
     def can_merge_cache_key(self):


Mime
View raw message