summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Heubeck <peter.heubeck@tieto.com>2011-11-07 14:31:04 +0100
committerPeter Heubeck <peter.heubeck@tieto.com>2011-11-10 14:00:35 +0100
commit0a5abe2a141134859030408c7d6b485a6b985fce (patch)
tree4cc971d5f90c63920346979c10cceb3affadef04
parent22d1f4695878b2f767921293e85275fcb7728697 (diff)
Fixed gerrit email verification link requires insecure login
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java
index 2c779994b6..abfaa0906a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java
@@ -56,6 +56,15 @@ public class RegisterNewEmailSender extends OutgoingEmail {
appendText(velocifyFile("RegisterNewEmail.vm"));
}
+ @Override
+ public String getGerritUrl() {
+ String url = args.urlProvider.get();
+ if (url.startsWith("http:")) {
+ url = url.replaceAll("http:", "https:");
+ }
+ return url;
+ }
+
public String getEmailRegistrationToken() {
try {
return authConfig.getEmailRegistrationToken().newToken(