incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [3/3] git commit: [#5403] upgrade to TG 2.1.4 so auto_reload_templates can be set in .ini file
Date Sat, 08 Dec 2012 19:26:22 GMT
[#5403] upgrade to TG 2.1.4 so auto_reload_templates can be set in .ini file


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

Branch: refs/heads/db/5403
Commit: f914c1f6c4ff37cfbfb1076e777485ee515aea37
Parents: cef0677
Author: Dave Brondsema <dbrondsema@geek.net>
Authored: Sat Dec 8 19:16:41 2012 +0000
Committer: Dave Brondsema <dbrondsema@geek.net>
Committed: Sat Dec 8 19:21:21 2012 +0000

----------------------------------------------------------------------
 .../controllers/basetest_neighborhood_root.py      |    4 ++--
 requirements-common.txt                            |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f914c1f6/Allura/allura/controllers/basetest_neighborhood_root.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/basetest_neighborhood_root.py b/Allura/allura/controllers/basetest_neighborhood_root.py
index 997d1b6..4eee52a 100644
--- a/Allura/allura/controllers/basetest_neighborhood_root.py
+++ b/Allura/allura/controllers/basetest_neighborhood_root.py
@@ -50,7 +50,6 @@ class BasetestNeighborhoodRootController(WsgiDispatchController, NeighborhoodCon
         for n in M.Neighborhood.query.find():
             if n.url_prefix.startswith('//'): continue
             n.bind_controller(self)
-        self.p_nbhd = M.Neighborhood.query.get(name='Projects')
         proxy_root = RootController()
         self.dispatch = DispatchTest()
         self.security = SecurityTests()
@@ -58,7 +57,8 @@ class BasetestNeighborhoodRootController(WsgiDispatchController, NeighborhoodCon
             setattr(self, attr, getattr(proxy_root, attr))
         self.gsearch = proxy_root.search
         self.rest = RestController()
-        super(BasetestNeighborhoodRootController, self).__init__()
+        p_nbhd = M.Neighborhood.query.get(name='Projects')
+        super(BasetestNeighborhoodRootController, self).__init__(p_nbhd)
 
     def _setup_request(self):
         pass

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f914c1f6/requirements-common.txt
----------------------------------------------------------------------
diff --git a/requirements-common.txt b/requirements-common.txt
index 3e846c5..e43d6d7 100644
--- a/requirements-common.txt
+++ b/requirements-common.txt
@@ -43,7 +43,8 @@ textile==2.1.5
 # dep of colander
 translationstring==0.4
 TimerMiddleware==0.4
-TurboGears2==2.1.3
+TurboGears2==2.1.4
+WebOb==1.0.8
 # part of the stdlib, but with a version number.  see http://guide.python-distribute.org/pip.html#listing-installed-packages
 wsgiref==0.1.2
 
@@ -59,7 +60,6 @@ Routes==1.12.3
 WebError==0.10.3
 WebFlash==0.1a9
 WebHelpers==1.3
-WebOb==1.1.1
 
 # git deps
 async==0.6.1


Mime
View raw message