Download as
Browse Code »

Commit b6124979037b4fb86ea416b08ec79b01c848946e

Authored by Dmitriy Zaporozhets
1 parent 86676476
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fixed devise email_from, reordered initalizers

Showing 3 changed files with 4 additions and 4 deletions   Show diff stats
config/initializers/00_before_all.rb 0 → 100644
  Diff comments   View file @b612497
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
  1 +GIT_HOST = YAML.load_file("#{Rails.root}/config/gitlab.yml")["git_host"]
  2 +EMAIL_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["email"]
  3 +GIT_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["git"]
config/initializers/devise.rb
  Diff comments   View file @b612497
@@ -4,7 +4,7 @@ Devise.setup do |config| @@ -4,7 +4,7 @@ Devise.setup do |config|
4 # ==> Mailer Configuration 4 # ==> Mailer Configuration
5 # Configure the e-mail address which will be shown in Devise::Mailer, 5 # Configure the e-mail address which will be shown in Devise::Mailer,
6 # note that it will be overwritten if you use your own mailer class with default "from" parameter. 6 # note that it will be overwritten if you use your own mailer class with default "from" parameter.
7 - config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com" 7 + config.mailer_sender = EMAIL_OPTS["from"]
8 8
9 # Configure the class responsible to send e-mails. 9 # Configure the class responsible to send e-mails.
10 # config.mailer = "Devise::Mailer" 10 # config.mailer = "Devise::Mailer"
config/initializers/gitlabhq/10_load_config.rb
View file @8667647
@@ -1,3 +0,0 @@ @@ -1,3 +0,0 @@
1 -GIT_HOST = YAML.load_file("#{Rails.root}/config/gitlab.yml")["git_host"]  
2 -EMAIL_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["email"]  
3 -GIT_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["git"]