diff options
author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-03-01 11:32:39 -0300 |
---|---|---|
committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-03-01 13:28:35 -0300 |
commit | 6297446d1773c95d86ecd31f591e1829b431f378 (patch) | |
tree | ff7ba9fc4c36eb5fb6893bfd98ad41424991f4d3 /app/services/issuable_base_service.rb | |
parent | 7b31095ef85982af2aa3bcc5861c5c22e284b15c (diff) | |
download | gitlab-ce-6297446d1773c95d86ecd31f591e1829b431f378.tar.gz |
Move wip handling to MergeRequest::BaseServicewip-slash-command-on-mr-description
Diffstat (limited to 'app/services/issuable_base_service.rb')
-rw-r--r-- | app/services/issuable_base_service.rb | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb index c552bf6ea41..5044a3651cf 100644 --- a/app/services/issuable_base_service.rb +++ b/app/services/issuable_base_service.rb @@ -109,6 +109,10 @@ class IssuableBaseService < BaseService @available_labels ||= LabelsFinder.new(current_user, project_id: @project.id).execute end + def handle_quick_actions(issuable) + merge_quick_actions_into_params!(issuable) + end + def merge_quick_actions_into_params!(issuable) original_description = params.fetch(:description, issuable.description) @@ -131,8 +135,7 @@ class IssuableBaseService < BaseService end def create(issuable) - merge_quick_actions_into_params!(issuable) - handle_wip_event(issuable) + handle_quick_actions(issuable) filter_params(issuable) params.delete(:state_event) @@ -312,18 +315,4 @@ class IssuableBaseService < BaseService def parent project end - - def handle_wip_event(issuable) - if wip_event = params.delete(:wip_event) - case issuable - when MergeRequest - # We update the title that is provided in the params or we use the mr title - title = params[:title] || issuable.title - params[:title] = case wip_event - when :wip then MergeRequest.wip_title(title) - when :unwip then MergeRequest.wipless_title(title) - end - end - end - end end |