Merge "TrivialRebase: Adapt to labels in 2.6" into stable-2.6
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>
----
diff --git a/Documentation/database-setup.txt b/Documentation/database-setup.txt
index 0465d62..c559b0e 100644
--- a/Documentation/database-setup.txt
+++ b/Documentation/database-setup.txt
@@ -33,7 +33,7 @@
full rights on the newly created database:
----
- $ createuser --username=postgres -S -R -D -P -E gerrit2
+ $ createuser --username=postgres -RDIElPS gerrit2
$ createdb --username=postgres -E UTF-8 -O gerrit2 reviewdb
----
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/FormatUtil.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/FormatUtil.java
index 4f4e8a7..5448dc0 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/FormatUtil.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/FormatUtil.java
@@ -119,11 +119,6 @@
}
}
- @Deprecated
- public static String nameEmail(com.google.gerrit.common.data.AccountInfo acct) {
- return nameEmail(asInfo(acct));
- }
-
/**
* Formats an account as a name and an email address.
* <p>
@@ -160,11 +155,6 @@
return name(asInfo(acct));
}
- @Deprecated
- public static String name(com.google.gerrit.common.data.AccountInfo acct) {
- return name(asInfo(acct));
- }
-
/**
* Formats an account name.
* <p>
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java
index b113a3b..0bf0ea9 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java
@@ -53,11 +53,11 @@
}
public String getDisplayString() {
- return FormatUtil.nameEmail(info);
+ return FormatUtil.nameEmail(FormatUtil.asInfo(info));
}
public String getReplacementString() {
- return FormatUtil.nameEmail(info);
+ return FormatUtil.nameEmail(FormatUtil.asInfo(info));
}
}
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ReviewerSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ReviewerSuggestOracle.java
index f3b1439..3f1de2b 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ReviewerSuggestOracle.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ReviewerSuggestOracle.java
@@ -65,7 +65,7 @@
public String getDisplayString() {
final AccountInfo accountInfo = reviewerInfo.getAccountInfo();
if (accountInfo != null) {
- return FormatUtil.nameEmail(accountInfo);
+ return FormatUtil.nameEmail(FormatUtil.asInfo(accountInfo));
}
return reviewerInfo.getGroup().getName() + " ("
+ Util.C.suggestedGroupLabel() + ")";
@@ -74,7 +74,7 @@
public String getReplacementString() {
final AccountInfo accountInfo = reviewerInfo.getAccountInfo();
if (accountInfo != null) {
- return FormatUtil.nameEmail(accountInfo);
+ return FormatUtil.nameEmail(FormatUtil.asInfo(accountInfo));
}
return reviewerInfo.getGroup().getName();
}
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]
</VirtualHost>
</pre>
</body>
diff --git a/gerrit-openid/.settings/org.eclipse.core.resources.prefs b/gerrit-openid/.settings/org.eclipse.core.resources.prefs
index f9fe345..839d647 100644
--- a/gerrit-openid/.settings/org.eclipse.core.resources.prefs
+++ b/gerrit-openid/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding/<project>=UTF-8
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitHttpd.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitHttpd.java
index 34e6970..3e7901a 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitHttpd.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitHttpd.java
@@ -21,8 +21,6 @@
import static com.google.gerrit.pgm.init.InitUtil.toURI;
import com.google.gerrit.pgm.util.ConsoleUI;
-import com.google.gerrit.reviewdb.client.AuthType;
-import com.google.gerrit.server.config.ConfigUtil;
import com.google.gerrit.server.config.SitePaths;
import com.google.gwtjsonrpc.server.SignedToken;
import com.google.inject.Inject;
@@ -191,8 +189,4 @@
throw die("Cannot delete " + tmpdir);
}
}
-
- private AuthType getAuthType() {
- return ConfigUtil.getEnum(flags.cfg, "auth", null, "type", AuthType.OPENID);
- }
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetStatistics.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetStatistics.java
index a9a226d..548b85a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetStatistics.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetStatistics.java
@@ -29,7 +29,6 @@
import org.eclipse.jgit.lib.Repository;
import java.io.IOException;
-import java.util.Properties;
@RequiresCapability(GlobalCapability.RUN_GC)
public class GetStatistics implements RestReadView<ProjectResource> {
