diff options
| -rw-r--r-- | gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java | 6 | ||||
| -rw-r--r-- | gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java | 1 |
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); } } |