summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-02-25 14:29:49 +0100
committerDouwe Maan <douwe@gitlab.com>2015-02-25 14:29:49 +0100
commit85af3e82bfe0ebd01e816ee7c5ee6a2c28ce8ff9 (patch)
tree9785baef8d54dbea21aceb18803ae9706cd63ae8 /app/mailers
parente0c186c35735a2dc9e05e88ad9975ae016c815d9 (diff)
downloadgitlab-ce-85af3e82bfe0ebd01e816ee7c5ee6a2c28ce8ff9.tar.gz
Add option to disable code diffs to EmailOnPush.
See #1950
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/emails/projects.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index 3b60aed6f9e..30959ab6a1e 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -16,13 +16,14 @@ module Emails
subject: subject("Project was moved"))
end
- def repository_push_email(project_id, recipient, author_id, branch, compare, send_from_committer_email = false)
+ def repository_push_email(project_id, recipient, author_id, branch, compare, send_from_committer_email = false, disable_diffs = false)
@project = Project.find(project_id)
@author = User.find(author_id)
@compare = compare
@commits = Commit.decorate(compare.commits)
@diffs = compare.diffs
@branch = branch.gsub("refs/heads/", "")
+ @disable_diffs = disable_diffs
@subject = "[#{@project.path_with_namespace}][#{@branch}] "