diff --git a/config/initializers/00_before_all.rb b/config/initializers/00_before_all.rb new file mode 100644 index 0000000..9691959 --- /dev/null +++ b/config/initializers/00_before_all.rb @@ -0,0 +1,3 @@ +GIT_HOST = YAML.load_file("#{Rails.root}/config/gitlab.yml")["git_host"] +EMAIL_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["email"] +GIT_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["git"] diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 5b066ed..78652bc 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -4,7 +4,7 @@ Devise.setup do |config| # ==> Mailer Configuration # Configure the e-mail address which will be shown in Devise::Mailer, # note that it will be overwritten if you use your own mailer class with default "from" parameter. - config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com" + config.mailer_sender = EMAIL_OPTS["from"] # Configure the class responsible to send e-mails. # config.mailer = "Devise::Mailer" diff --git a/config/initializers/gitlabhq/10_load_config.rb b/config/initializers/gitlabhq/10_load_config.rb deleted file mode 100644 index 9691959..0000000 --- a/config/initializers/gitlabhq/10_load_config.rb +++ /dev/null @@ -1,3 +0,0 @@ -GIT_HOST = YAML.load_file("#{Rails.root}/config/gitlab.yml")["git_host"] -EMAIL_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["email"] -GIT_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["git"] -- libgit2 0.21.2