deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[#169] – Move email 'from' & 'host' settings to config file

Browse source
This commit is contained in:
Valery Sizov 2011-11-22 23:36:14 +02:00
parent a4fbe13fce
commit d61268e4f1
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/mailers/notify.rb
View file

@ -5,7 +5,7 @@ class Notify < ActionMailer::Base
def new_user_email(user, password) def new_user_email(user, password)
@user = user @user = user
@password = password @password = password
mail(:to => @user.email, :subject => "gitlab | Account was created for you") mail(:to => @user.email, :subject => "gitlab | Account was created for you", :from => EMAIL_OPTS["from"])
end end
def new_issue_email(issue) def new_issue_email(issue)
@ -13,14 +13,14 @@ class Notify < ActionMailer::Base
@project = issue.project @project = issue.project
@issue = issue @issue = issue
mail(:to => @user.email, :subject => "gitlab | New Issue was created") mail(:to => @user.email, :subject => "gitlab | New Issue was created", :from => EMAIL_OPTS["from"])
end end
def note_wall_email(user, note) def note_wall_email(user, note)
@user = user @user = user
@note = note @note = note
@project = note.project @project = note.project
mail(:to => @user.email, :subject => "gitlab | #{@note.project.name} ") mail(:to => @user.email, :subject => "gitlab | #{@note.project.name} ", :from => EMAIL_OPTS["from"])
end end
def note_commit_email(user, note) def note_commit_email(user, note)
@ -28,7 +28,7 @@ class Notify < ActionMailer::Base
@note = note @note = note
@project = note.project @project = note.project
@commit = @project.repo.commits(note.noteable_id).first @commit = @project.repo.commits(note.noteable_id).first
mail(:to => @user.email, :subject => "gitlab | #{@note.project.name} ") mail(:to => @user.email, :subject => "gitlab | #{@note.project.name} ", :from => EMAIL_OPTS["from"])
end end
def note_issue_email(user, note) def note_issue_email(user, note)
@ -36,6 +36,6 @@ class Notify < ActionMailer::Base
@note = note @note = note
@project = note.project @project = note.project
@issue = note.noteable @issue = note.noteable
mail(:to => @user.email, :subject => "gitlab | #{@note.project.name} ") mail(:to => @user.email, :subject => "gitlab | #{@note.project.name} ", :from => EMAIL_OPTS["from"])
end end
end end

1
config/email.yml Normal file
View file

@ -0,0 +1 @@
from: notify@gitlabhq.com

1
config/initializers/load_config.rb
View file

@ -1 +1,2 @@
GITOSIS = YAML.load_file("#{Rails.root}/config/gitosis.yml") GITOSIS = YAML.load_file("#{Rails.root}/config/gitosis.yml")
EMAIL_OPTS = YAML.load_file("#{Rails.root}/config/email.yml")