opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.12'

Browse Source 
* stable-2.12:
  Documentation: Fix anchor for gitweb.urlEncode
  Fix gitweb backlinks
  AbstractSubmit: Refactor ref-updated event tests to be more precise
  ChangeData: Prevent possible NPE when loading current patch set
  Do not keep reference to non-singleton ListTags in singleton TagsCollection
  Bazel: Fix CheckReturnValue error detected by ErrorProne
  Submit: Don't assume the "Submitted Together" Tab exists.
  Submit: Give another error message when the change itself has problems
  Submit: Move check for enabling button after rechecking mergeability
  Bazel: Fix CheckReturnValue error detected by ErrorProne
  ACL screen: Show error when group to be added is not found
  Bazel: Fix MisusedWeekYear error detected by ErrorProne
  Submit: fix typo in user message
  AbstractSubmit: Add stricter assertions about ref-updated event content
  Eclipse: Update compiler warnings settings from Eclipse MARS.2
  Upgrade replication plugin to latest revision

This merge reverts the following commits:

  AbstractSubmit: Refactor ref-updated event tests to be more precise
  AbstractSubmit: Add stricter assertions about ref-updated event content

because they are related to tests that are currently not working
on the master branch. These are reintroduced in later commits
that are still under review.

Change-Id: Icce7ad25f91ed0f7cae0f2673eff88fd648d9293
This commit is contained in:
David Pursehouse
2016-06-10 09:16:26 +09:00
parent 270e105f88 5d592e885d
commit 4014b24fea
8 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java
View File

@@ -281,9 +281,9 @@ class GitwebServlet extends HttpServlet {
p.print(" my $h = shift;\n");
p.print(" my $q;\n");
p.print(" if (!$h || $h eq 'HEAD') {\n");
p.print(" $q = qq{#q,project:$ENV{'GERRIT_PROJECT_NAME'}};\n");
p.print(" $q = qq{#/q/project:$ENV{'GERRIT_PROJECT_NAME'}};\n");
p.print(" } elsif ($h =~ /^refs\\/heads\\/([-\\w]+)$/) {\n");
p.print(" $q = qq{#q,project:$ENV{'GERRIT_PROJECT_NAME'}");
p.print(" $q = qq{#/q/project:$ENV{'GERRIT_PROJECT_NAME'}");
p.print("+branch:$1};\n"); // wrapped
p.print(" } elsif ($h =~ /^refs\\/changes\\/\\d{2}\\/(\\d+)\\/\\d+$/) ");
p.print("{\n"); // wrapped