summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Daarstad <tomas.daarstad@tieto.com>2012-04-02 10:56:34 +0200
committerTomas Daarstad <tomas.daarstad@tieto.com>2012-04-02 10:56:52 +0200
commitdd455b85dd66709b48f08f4141834592c0f24f44 (patch)
treeed7cb5015b427037fd0dd278551e055d259ffbf0
parent281275d4f1465cf2454c7947989dfbee1e7f14cf (diff)
parent2f32e397ae124cd8ea8cecf63a16c2e455eebfd9 (diff)
Integration release of NQt Gerrit
Fixed JIRA issues: 167 Fixed gerrit email verification link requires insecure login 195 Added support for European style dates 220 Added a check to prevent NumberFormatException 270 Fixed review database update from StagingApprove 335 Fixed automatic update of reviewer list 340 Don't send mail for publishing comments for stage approved 347 Fixed late removal of review approvals 348 Fixed cherry pick footer settings 350 Consider sanity review column 352 Fix typo in project config's topic review checkbox label 355 Hide review panel also on diff and topic pages 357 Add support for public anonymous access to gerrit 372 Validate topic current change set 375 Topic permalink copy to clipboard corrected 381 Do not permit trailing slash when pushing 382 Integration release of NQt Gerrit 382 Added a check to prevent NullPointerException Added a check to prevent ArrayIndexOutOfBoundsException 385 Keep highlight on review request 389 Set patch approval changeOpen to false 411 Updated to use current patch id in loadFileList method. 456 Remove leading and trailing whitespace in username when creating a request 462 Updated for eclipse 3.7, m2e and fixed the full name of the MAVEN2_CLASSPATH_CONTAINER 468 Fixed the Review score put on wrong change Change-Id: Ib4393caec77eafe106a766fbbe5c30e341c3826b
-rw-r--r--gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java6
-rw-r--r--gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java1
2 files changed, 6 insertions, 1 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
index ad38d0af84..5b62a61dfa 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
@@ -497,6 +497,12 @@ public class Gerrit implements EntryPoint {
switch (cfg.getAuthType()) {
case HTTP:
case HTTP_LDAP:
+ menuRight.addItem(C.menuSignIn(), new Command() {
+ public void execute() {
+ doSignIn(History.getToken());
+ }
+ });
+ break;
case CLIENT_SSL_CERT_LDAP:
break;
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java
index 553b1f4217..42180e0646 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java
@@ -20,7 +20,6 @@ import com.google.inject.servlet.ServletModule;
public class HttpAuthModule extends ServletModule {
@Override
protected void configureServlets() {
- filter("/").through(HttpAuthFilter.class);
serve("/login/*").with(HttpLoginServlet.class);
}
}