diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-12 21:47:30 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-12 21:47:30 +0300 |
| commit | b8401cd0b201ab9caecb60dcc477637e70da4df9 (patch) | |
| tree | e197770a94a39ea4956007503440d13cf0b5434e /lib/api/merge_requests.rb | |
| parent | b75f9721df6c7f5231a9d19e38ec8f0395957c0d (diff) | |
| parent | 7f01d49b69130343d95d7ec470d69aeb14fb94fe (diff) | |
Merge branch 'master' into bootstrap4
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 3264a26f7d2..d4cc18f622b 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -189,7 +189,7 @@ module API post ":id/merge_requests" do Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42316') - authorize! :create_merge_request, user_project + authorize! :create_merge_request_from, user_project mr_params = declared_params(include_missing: false) mr_params[:force_remove_source_branch] = mr_params.delete(:remove_source_branch) |