From 25924a9089ae813fe9ec8697f6bd3798377d60fb Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 31 Mar 2012 15:59:06 +0300
Subject: [PATCH] Email link https support

---
 app/mailers/notify.rb     | 2 ++
 config/gitlab.yml.example | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 50ccb991a..9c2cc7c5b 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 5d40b2b34..05d008588 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
-- 
2.11.0