diff options
| -rw-r--r-- | app/mailers/notify.rb | 2 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index 50ccb991a44..9c2cc7c5b29 100644 --- 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 5d40b2b3440..05d008588db 100644 --- 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 |