commit d605babc37b7d0af183715de78052ca554659d21
author David Pursehouse <dpursehouse@collab.net> Tue Sep 27 00:31:20 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 27 00:31:20 2016 +0000
tree f984d1ee499b1e832213bf527a85917015895d7a
parent eea737beabebdf9d70eb42ca91675de6070ba7aa
parent 817e62ae29c3344e77c752d3fc1ce44de422aee1

Merge "Fix server error when navigating up to change while working" into stable-2.13

gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java
index 63d2ddb..149931d 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java
@@ -174,7 +174,7 @@
       this.loader = loader;
       this.byName = byUsername;
       this.readFromGit =
-          cfg.getBoolean("user", null, "readProjectWatchesFromGit", true);
+          cfg.getBoolean("user", null, "readProjectWatchesFromGit", false);
       this.watchConfig = watchConfig;
     }
 

gerrit-server/src/main/java/com/google/gerrit/server/account/GetWatchedProjects.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetWatchedProjects.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetWatchedProjects.java
index 7cda472..3748e17 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetWatchedProjects.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetWatchedProjects.java
@@ -60,7 +60,7 @@
     this.dbProvider = dbProvider;
     this.self = self;
     this.readFromGit =
-        cfg.getBoolean("user", null, "readProjectWatchesFromGit", true);
+        cfg.getBoolean("user", null, "readProjectWatchesFromGit", false);
     this.watchConfig = watchConfig;
   }