diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-11-20 11:04:51 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-11-20 11:04:51 +0000 |
commit | 5cd0e7d29ff4c9fbe3a542212e6823b741abcac9 (patch) | |
tree | a8fbf3d796e48b9eaf25309839b11c923bf5b548 /app/services/issues | |
parent | e65e184269bb27661c9a20658933e8482aa90b62 (diff) | |
parent | 6b0ea951cac3905437abb2bbacaf422371f097e0 (diff) | |
download | gitlab-ce-5cd0e7d29ff4c9fbe3a542212e6823b741abcac9.tar.gz |
Merge branch '40085-add-a-create_merge_request-quick-action' into 'master'
Resolve "Add a `/create_merge_request` quick action"
Closes #40085
See merge request gitlab-org/gitlab-ce!22485
Diffstat (limited to 'app/services/issues')
-rw-r--r-- | app/services/issues/update_service.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb index fba252b0bae..a1d0cc0e568 100644 --- a/app/services/issues/update_service.rb +++ b/app/services/issues/update_service.rb @@ -11,6 +11,12 @@ module Issues move_issue_to_new_project(issue) || update(issue) end + def update(issue) + create_merge_request_from_quick_action + + super + end + def before_update(issue) spam_check(issue, current_user) end @@ -93,6 +99,13 @@ module Issues private + def create_merge_request_from_quick_action + create_merge_request_params = params.delete(:create_merge_request) + return unless create_merge_request_params + + MergeRequests::CreateFromIssueService.new(project, current_user, create_merge_request_params).execute + end + def handle_milestone_change(issue) return if skip_milestone_email |