summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2017-11-16 13:07:15 +1100
committerSimon Knox <psimyn@gmail.com>2017-11-16 13:07:15 +1100
commit2a9562b382ab67f589c99dc5c52bfb40523b750c (patch)
treec53fe47575f3a62aa2eb2a129e5493bc9caac965
parent5414b003b7cf0456a0a415fafedd4f1da2da8ded (diff)
downloadgitlab-ce-initial-discussion-json.tar.gz
add user permissions to mr entityinitial-discussion-json
-rw-r--r--app/serializers/merge_request_entity.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/serializers/merge_request_entity.rb b/app/serializers/merge_request_entity.rb
index b53a49fe59e..018e04dba2d 100644
--- a/app/serializers/merge_request_entity.rb
+++ b/app/serializers/merge_request_entity.rb
@@ -95,6 +95,14 @@ class MergeRequestEntity < IssuableEntity
expose :can_cherry_pick_on_current_merge_request do |merge_request|
presenter(merge_request).can_cherry_pick_on_current_merge_request?
end
+
+ expose :can_create_note do |issue|
+ can?(request.current_user, :create_note, issue.project)
+ end
+
+ expose :can_update do |issue|
+ can?(request.current_user, :update_issue, issue)
+ end
end
# Paths