summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorJohn Jarvis <jarv@gitlab.com>2019-03-05 10:28:59 +0000
committerJohn Jarvis <jarv@gitlab.com>2019-03-05 10:28:59 +0000
commit83cb7482560c04d14fda372fcb4f95d667cd1962 (patch)
treeec36cfddb359467a35276a99b5bc872b1fdfb7e2 /app/mailers
parent960101c20bb8ec5a2d1d3f01474676c7ea95adc7 (diff)
parenta24eabb1782785ad0bcf2460c3fff67106598b83 (diff)
downloadgitlab-ce-83cb7482560c04d14fda372fcb4f95d667cd1962.tar.gz
Merge branch 'merge-dev-to-master' into 'master'
Merge dev.gitlab.org master into GitLab.com master Closes #2794, #2814, #2806, #2805, #2798, #2795, #2788, and #2787 See merge request gitlab-org/gitlab-ce!25746
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/emails/issues.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb
index 654ae211310..d2e334fb856 100644
--- a/app/mailers/emails/issues.rb
+++ b/app/mailers/emails/issues.rb
@@ -74,6 +74,7 @@ module Emails
@new_issue = new_issue
@new_project = new_issue.project
+ @can_access_project = recipient.can?(:read_project, @new_project)
mail_answer_thread(issue, issue_thread_options(updated_by_user.id, recipient.id, reason))
end