diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-12-13 13:28:34 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-12-13 13:28:34 +0000 |
| commit | b305a1331c14f819914ef1230bdf184860475045 (patch) | |
| tree | e1e4e2e3b1ce5b3df625ca532de67bae7a41937b /app/services/issuable_base_service.rb | |
| parent | f12be5c9259da532ab1867ed7547111f3cce3237 (diff) | |
| parent | b1e3cb24fa777bc6776c7602935876f546383a38 (diff) | |
| download | gitlab-ce-b305a1331c14f819914ef1230bdf184860475045.tar.gz | |
Merge branch 'fix-create-mr-from-issue-with-template' into 'master'
Execute quick actions when creating MR from issue
Closes gitlab-ee#4277
See merge request gitlab-org/gitlab-ce!15810
Diffstat (limited to 'app/services/issuable_base_service.rb')
| -rw-r--r-- | app/services/issuable_base_service.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb index 2c51ac13815..e7463e6e25c 100644 --- a/app/services/issuable_base_service.rb +++ b/app/services/issuable_base_service.rb @@ -106,12 +106,14 @@ class IssuableBaseService < BaseService end def merge_quick_actions_into_params!(issuable) + original_description = params.fetch(:description, issuable.description) + description, command_params = QuickActions::InterpretService.new(project, current_user) - .execute(params[:description], issuable) + .execute(original_description, issuable) # Avoid a description already set on an issuable to be overwritten by a nil - params[:description] = description if params.key?(:description) + params[:description] = description if description params.merge!(command_params) end |