commit 1d27b5e27759e3750c9635c7ed2d9a5d5f87a6fd
author Saša Živkov <zivkov@gmail.com> Wed Dec 12 01:54:08 2012 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 12 01:54:08 2012 -0800
tree ac9d6b164be32d25f7b46c72c46af60f8f0965b2
parent ef8b0f62034fbf460b4fc82a0954b48e58f5e4f7
parent 6e811b95eee7f7150792ecf1ed0d60062d03905d

Merge "Match all git fetch/clone/push commands to the command executor" into stable-2.5

gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java

diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java
index 5cb7787..fd40888 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java
@@ -80,9 +80,6 @@
     if (AccessSection.ALL.equals(ref)) {
       return !OWNER.equals(permissionName);
     }
-    if (AccessSection.REF_CONFIG.equals(ref)) {
-      return !PUSH.equals(permissionName);
-    }
     return true;
   }
 

gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java

diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
index c164d48..a826c88 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
@@ -356,6 +356,9 @@
 
   private Injector createWebInjector() {
     final List<Module> modules = new ArrayList<Module>();
+    if (sshd) {
+      modules.add(new ProjectQoSFilter.Module());
+    }
     modules.add(RequestContextFilter.module());
     modules.add(AllRequestFilter.module());
     modules.add(CacheBasedWebSession.module());
@@ -365,7 +368,6 @@
     modules.add(new HttpPluginModule());
     if (sshd) {
       modules.add(sshInjector.getInstance(WebSshGlueModule.class));
-      modules.add(new ProjectQoSFilter.Module());
     } else {
       modules.add(new NoSshModule());
     }