Email link https support

diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 50ccb99..9c2cc7c 100644 (file)
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -1,5 +1,7 @@
 class Notify < ActionMailer::Base
   default_url_options[:host] = EMAIL_OPTS["host"]
+  default_url_options[:protocol] = -> { EMAIL_OPTS["protocol"] ? EMAIL_OPTS["protocol"] : "http" }.call
+
   default from: EMAIL_OPTS["from"]
 
   def new_user_email(user, password)

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 5d40b2b..05d0085 100644 (file)
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -6,6 +6,10 @@ email:
   from: notify@gitlabhq.com
   host: gitlabhq.com
 
+  # Protocol used for links in email letters
+  # Value can be http or https
+  protocol: http # or https
+
 # Git Hosting congiguration
 git_host:
   system: gitolite