summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-17 16:20:45 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-17 16:20:45 +0200
commit074efd8fd57736bcec25b2f08324b9d25aa886d5 (patch)
tree5f22a0a2e78ed917cbca5bca41ed1ebcb40f6782 /app/mailers
parent8b89ef8639b2b6ee69d991fb0d6089f9437bbee2 (diff)
downloadgitlab-ce-074efd8fd57736bcec25b2f08324b9d25aa886d5.tar.gz
Email on push: dont send email if new branch was pushed or branch was removed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/emails/projects.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index 809ce323958..df21d7b5b02 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -14,10 +14,10 @@ module Emails
subject: subject("Project was moved"))
end
- def repository_push_email(project_id, recipient, branch, compare)
- @project = Project.find project_id
- @commits = Commit.decorate compare.commits
- @commit = compare.commit
+ def repository_push_email(project_id, recipient, author_id, branch, compare)
+ @project = Project.find(project_id)
+ @author = User.find(author_id)
+ @commits = Commit.decorate(compare.commits)
@diffs = compare.diffs
@branch = branch