Diff of /Allura/allura/controllers/project.py [3bfd4a] .. [024b92]

  Switch to side-by-side view 

--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -280,7 +280,9 @@
     @with_trailing_slash
     def index(self, **kw):
         mount = c.project.first_mount('read')
-        activity_enabled = asbool(config.get('activitystream.enabled', False))
+        activity_enabled = config.get('activitystream.enabled', False)
+        activity_enabled = request.cookies.get('activitystream.enabled', activity_enabled)
+        activity_enabled = asbool(activity_enabled)
         if activity_enabled and c.project.app_instance('activity'):
             redirect('activity/')
         elif mount is not None: