diff options
author | Valery Sizov <vsv2711@gmail.com> | 2011-11-22 23:36:14 +0200 |
---|---|---|
committer | Valery Sizov <vsv2711@gmail.com> | 2011-11-22 23:36:14 +0200 |
commit | d61268e4f15502d46a61ee34f27248194c2f3f53 (patch) | |
tree | 19498318acc806603d3afd728c608b427d4b5014 /config | |
parent | a4fbe13fce87cb6ff2a27a2574ae25bf1dad145c (diff) | |
download | gitlab-ce-d61268e4f15502d46a61ee34f27248194c2f3f53.tar.gz |
[#169] – Move email 'from' & 'host' settings to config file
Diffstat (limited to 'config')
-rw-r--r-- | config/email.yml | 1 | ||||
-rw-r--r-- | config/initializers/load_config.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/email.yml b/config/email.yml new file mode 100644 index 00000000000..a763e1006f1 --- /dev/null +++ b/config/email.yml @@ -0,0 +1 @@ +from: notify@gitlabhq.com diff --git a/config/initializers/load_config.rb b/config/initializers/load_config.rb index 6c7289e0380..60f8515eb65 100644 --- a/config/initializers/load_config.rb +++ b/config/initializers/load_config.rb @@ -1 +1,2 @@ GITOSIS = YAML.load_file("#{Rails.root}/config/gitosis.yml") +EMAIL_OPTS = YAML.load_file("#{Rails.root}/config/email.yml") |