| commit | 3c89d5cce45e6ce8a836a90d12aba2cfee299e66 | [log] [tgz] |
|---|---|---|
| author | Saša Živkov <zivkov@gmail.com> | Wed Dec 12 01:55:00 2012 -0800 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Dec 12 01:55:00 2012 -0800 |
| tree | 6089d7a358a5bd5be845aa06f994d9638bbdd772 | |
| parent | 1d27b5e27759e3750c9635c7ed2d9a5d5f87a6fd [diff] | |
| parent | ed64d435b2b6380e8f1f235c7eb10246d2d69c8d [diff] |
Merge "Fix auto closing of changes on direct push" into stable-2.5
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; }
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()); }
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java index 2d6db63..8d320d4 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java
@@ -71,7 +71,7 @@ private static final String CANCEL = ATT_SPACE + "/CANCEL"; private static final String FILTER_RE = - "^/p/(.*)/(git-upload-pack|git-receive-pack)$"; + "^/(.*)/(git-upload-pack|git-receive-pack)$"; private static final Pattern URI_PATTERN = Pattern.compile(FILTER_RE); public static class Module extends ServletModule {