Merge branch 'master' of github.com:gitlabhq/gitlab-ci

gitlabhq · Jan 3, 2014 · bf65da1 · bf65da1
2 parents 0575454 + abc1f6f
commit bf65da1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/config/initializers/smtp_settings.rb.sample b/config/initializers/smtp_settings.rb.sample
@@ -4,7 +4,7 @@
 # 3. Restart GitLab instance
 #
 if Rails.env.production?
-  Gitlab::Application.config.action_mailer.delivery_method = :smtp
+  ActionMailer::Base.delivery_method = :smtp
 
   ActionMailer::Base.smtp_settings = {
     address: "email.server.com",

diff --git a/doc/installation.md b/doc/installation.md
@@ -214,7 +214,7 @@ You should use your GitLab credentials in order to login
 If you want to use SMTP do next:
 
     # Copy config file
-    sudo -u gitlab_ci -H cp config/initializers/smtp_settings.rb.example config/initializers/smtp_settings.rb
+    sudo -u gitlab_ci -H cp config/initializers/smtp_settings.rb.sample config/initializers/smtp_settings.rb
 
     # Edit it with your settings
     sudo -u gitlab_ci -H editor config/initializers/smtp_settings.rb