commit 38c0eed39def3f6800c8d2b1243f2bf7e79182d9
author Shawn Pearce <sop@google.com> Fri Apr 19 04:15:12 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 19 04:15:13 2013 +0000
tree 2ef34f54ffcfe235a7b0acb2b9872d954bad2053
parent 2c4f2d8353610bb8529d5b2c3376a90e42ea3105
parent a763539f48138a2039a9e58a990fe36d15c20656

Merge "Remove deprecated methods from FormatUtil" into stable-2.6

Documentation/config-reverseproxy.txt

diff --git a/Documentation/config-reverseproxy.txt b/Documentation/config-reverseproxy.txt
index c932c0c..0857442 100644
--- a/Documentation/config-reverseproxy.txt
+++ b/Documentation/config-reverseproxy.txt
@@ -55,7 +55,7 @@
 
 	  AllowEncodedSlashes NoDecode
 	  RewriteEngine On
-	  RewriteRule ^/r/(.*) http://localhost:8081/r/$1
+	  RewriteRule ^/r/(.*) http://localhost:8081/r/$1 [NE,P]
 	</VirtualHost>
 ----
 

contrib/trivial_rebase.py

diff --git a/contrib/trivial_rebase.py b/contrib/trivial_rebase.py
index 6254c69..60057ce 100755
--- a/contrib/trivial_rebase.py
+++ b/contrib/trivial_rebase.py
@@ -216,7 +216,7 @@
       # Note: Sites with different 'copy_min_score' values in the
       # approval_categories DB table might want different behavior here.
       # Additional categories should also be added if desired.
-      if approval["category_id"] == "CRVW":
+      if approval["category_id"] == "CRVW" and approval['value'] != '-2':
         self.AppendAcctApproval(approval['account_id'], '--code-review %s' % approval['value'])
       elif approval["category_id"] == "VRIF":
         # Don't re-add verifies

gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/ConfigurationError.html

diff --git a/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/ConfigurationError.html b/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/ConfigurationError.html
index a7cd489..0bc3369 100644
--- a/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/ConfigurationError.html
+++ b/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/ConfigurationError.html
@@ -58,7 +58,7 @@
 
     AllowEncodedSlashes NoDecode
     RewriteEngine On
-    RewriteRule ^<span class='ContextPath'>/r</span>/(.*) http://...<span class='ContextPath'>/r</span>/$1
+    RewriteRule ^<span class='ContextPath'>/r</span>/(.*) http://...<span class='ContextPath'>/r</span>/$1 [NE,P]
 &lt;/VirtualHost&gt;
     </pre>
   </body>