Email link https support

2012-03-31 15:59:06 +03:00 · 2012-03-31 15:59:06 +03:00 · 25924a9089
parent 8ee0993fdf
commit 25924a9089
2 changed files with 6 additions and 0 deletions
--- 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)
--- 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