diff options
| author | Jarka Kadlecova <kadlecovaj@gmail.com> | 2016-11-24 15:05:15 +0100 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-01-11 08:48:07 -0500 |
| commit | 7ab3dd4b302a85c1b005e9ef290ebac631cda673 (patch) | |
| tree | 9210fbc8f4e53c33970e6218c822de95c8963288 /app/controllers/projects | |
| parent | 4404ea8662508c60f96e6730d9a45feb68498c28 (diff) | |
| download | gitlab-ce-7ab3dd4b302a85c1b005e9ef290ebac631cda673.tar.gz | |
support `/merge` slash comand for MRs
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/notes_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index b71509f2c9b..c5d93ce25bc 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -23,7 +23,8 @@ class Projects::NotesController < Projects::ApplicationController end def create - @note = Notes::CreateService.new(project, current_user, note_params).execute + create_params = note_params.merge(merge_request_diff_head_sha: params[:merge_request_diff_head_sha]) + @note = Notes::CreateService.new(project, current_user, create_params).execute if @note.is_a?(Note) Banzai::NoteRenderer.render([@note], @project, current_user) |