Commit 21d566ea authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of dev.gitlabhq.com:gitlabhq

parents 7ebba27d d61268e4
...@@ -5,7 +5,7 @@ class Notify < ActionMailer::Base ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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
from: notify@gitlabhq.com
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")
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment