diff options
| author | Shawn O. Pearce <sop@google.com> | 2011-05-20 08:06:26 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-05-20 08:06:26 -0700 |
| commit | ebe5db58f9b15d3445a5cb64baed1fb1e9e14498 (patch) | |
| tree | 06e54be843d0d102442ac21b9625c5f14696b05d | |
| parent | e647a81b1da9ed8692eb629453b21cd8f5834427 (diff) | |
| parent | 79a9896f599eede025e0ad78d11c8cf24dade896 (diff) | |
Merge changes I14eb9d19,I8f6d5c5a into stable
* changes:
Send new patchset event after its available
Enable git:// download URLs if canonicalGitUrl set
| -rw-r--r-- | gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java | 3 | ||||
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java index efa971b124..364d710c5f 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java @@ -191,7 +191,8 @@ class PatchSetComplexDisclosurePanel extends ComplexDisclosurePanel implements O if (changeDetail.isAllowsAnonymous() && Gerrit.getConfig().getGitDaemonUrl() != null - && allowedSchemes.contains(DownloadScheme.ANON_GIT)) { + && (allowedSchemes.contains(DownloadScheme.ANON_GIT) || + allowedSchemes.contains(DownloadScheme.DEFAULT_DOWNLOADS))) { StringBuilder r = new StringBuilder(); r.append(Gerrit.getConfig().getGitDaemonUrl()); r.append(projectName); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java index 445974fe7b..4380ff015f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java @@ -1373,8 +1373,6 @@ public class ReceiveCommits implements PreReceiveHook, PostReceiveHook { insertDummyApproval(result, reviewer, catId, db); } } - - hooks.doPatchsetCreatedHook(result.change, ps); } final RefUpdate ru = repo.updateRef(ps.getRefName()); @@ -1385,6 +1383,7 @@ public class ReceiveCommits implements PreReceiveHook, PostReceiveHook { + repo.getDirectory() + ": " + ru.getResult()); } replication.scheduleUpdate(project.getNameKey(), ru.getName()); + hooks.doPatchsetCreatedHook(result.change, ps); request.cmd.setResult(ReceiveCommand.Result.OK); try { |