summaryrefslogtreecommitdiff
path: root/lib/gitlab/email
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2018-04-06 19:58:53 +0200
committerBob Van Landuyt <bob@vanlanduyt.co>2018-04-11 10:51:17 +0200
commit71ccfde322b633e9245bee6acba1e64cb7640f19 (patch)
treee81b9d66257711bd9a3dd31d70d623b1a1927502 /lib/gitlab/email
parent083b0a9b034a0e4004c012444f1a8811bd96ed29 (diff)
downloadgitlab-ce-71ccfde322b633e9245bee6acba1e64cb7640f19.tar.gz
Correct permissions for creating merge requests from issues
This could only be possible for users that can create merge requests within a project. So they need to be a allowed to create a branch and create a merge request.
Diffstat (limited to 'lib/gitlab/email')
-rw-r--r--lib/gitlab/email/handler/create_merge_request_handler.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/email/handler/create_merge_request_handler.rb b/lib/gitlab/email/handler/create_merge_request_handler.rb
index 3436306e122..2f864f2082b 100644
--- a/lib/gitlab/email/handler/create_merge_request_handler.rb
+++ b/lib/gitlab/email/handler/create_merge_request_handler.rb
@@ -23,7 +23,8 @@ module Gitlab
def execute
raise ProjectNotFound unless project
- validate_permission!(:create_merge_request)
+ validate_permission!(:create_merge_request_in)
+ validate_permission!(:create_merge_request_from)
verify_record!(
record: create_merge_request,