diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-05-30 13:18:04 -0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-05-30 13:19:49 -0300 |
| commit | c8a30e3d83158a6ec759e656fe0dba55ac10593a (patch) | |
| tree | cac2b431e84531672fc6866bf08ee894462ccb86 /app/controllers/projects/merge_requests_controller.rb | |
| parent | 439adb96dadd49124d080db0db0b0076d2049c6b (diff) | |
| download | gitlab-ce-c8a30e3d83158a6ec759e656fe0dba55ac10593a.tar.gz | |
Adjust permitted params filtering on merge scheduling46903-osw-fix-permitted-params-filtering-on-merge-scheduling
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 507a07c6e1b..ecea6e1b2bf 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -296,14 +296,14 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo elsif @merge_request.actual_head_pipeline.success? # This can be triggered when a user clicks the auto merge button while # the tests finish at about the same time - @merge_request.merge_async(current_user.id, params) + @merge_request.merge_async(current_user.id, merge_params) :success else :failed end else - @merge_request.merge_async(current_user.id, params) + @merge_request.merge_async(current_user.id, merge_params) :success end |