diff options
author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-03-05 10:24:18 -0300 |
---|---|---|
committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-03-05 10:24:18 -0300 |
commit | 4ed79b4d4898221dee1b075ddfd17f8561699172 (patch) | |
tree | a9ff5d7b6e9e21ebaee9c05a5fe8b0e58713c455 | |
parent | 6297446d1773c95d86ecd31f591e1829b431f378 (diff) | |
download | gitlab-ce-4ed79b4d4898221dee1b075ddfd17f8561699172.tar.gz |
Rename quick actions handler
-rw-r--r-- | app/services/issuable_base_service.rb | 4 | ||||
-rw-r--r-- | app/services/merge_requests/create_service.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb index 5044a3651cf..02fb48108fb 100644 --- a/app/services/issuable_base_service.rb +++ b/app/services/issuable_base_service.rb @@ -109,7 +109,7 @@ class IssuableBaseService < BaseService @available_labels ||= LabelsFinder.new(current_user, project_id: @project.id).execute end - def handle_quick_actions(issuable) + def handle_quick_actions_on_create(issuable) merge_quick_actions_into_params!(issuable) end @@ -135,7 +135,7 @@ class IssuableBaseService < BaseService end def create(issuable) - handle_quick_actions(issuable) + handle_quick_actions_on_create(issuable) filter_params(issuable) params.delete(:state_event) diff --git a/app/services/merge_requests/create_service.rb b/app/services/merge_requests/create_service.rb index 0ed7ee6c57a..c57a2445341 100644 --- a/app/services/merge_requests/create_service.rb +++ b/app/services/merge_requests/create_service.rb @@ -35,7 +35,7 @@ module MergeRequests end # Override from IssuableBaseService - def handle_quick_actions(merge_request) + def handle_quick_actions_on_create(merge_request) super handle_wip_event(merge_request) end |