Email link https support

Dmitriy Zaporozhets
1 parent 8ee0993f
Showing 2 changed files with 6 additions and 0 deletions Show diff stats
app/mailers/notify.rb
config/gitlab.yml.example
 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)
@@ -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
1	1	class Notify < ActionMailer::Base
2	2	default_url_options[:host] = EMAIL_OPTS["host"]
	3	+ default_url_options[:protocol] = -> { EMAIL_OPTS["protocol"] ? EMAIL_OPTS["protocol"] : "http" }.call
	4	+
3	5	default from: EMAIL_OPTS["from"]
4	6
5	7	def new_user_email(user, password)
...	...
...	...	@@ -6,6 +6,10 @@ email:
6	6	from: notify@gitlabhq.com
7	7	host: gitlabhq.com
8	8
	9	+ # Protocol used for links in email letters
	10	+ # Value can be http or https
	11	+ protocol: http # or https
	12	+
9	13	# Git Hosting congiguration
10	14	git_host:
11	15	system: gitolite
...	...