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/services/notes/create_service.rb | |
| parent | 4404ea8662508c60f96e6730d9a45feb68498c28 (diff) | |
| download | gitlab-ce-7ab3dd4b302a85c1b005e9ef290ebac631cda673.tar.gz | |
support `/merge` slash comand for MRs
Diffstat (limited to 'app/services/notes/create_service.rb')
| -rw-r--r-- | app/services/notes/create_service.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb index 1beca9f4109..cdd765c85eb 100644 --- a/app/services/notes/create_service.rb +++ b/app/services/notes/create_service.rb @@ -1,6 +1,8 @@ module Notes class CreateService < BaseService def execute + merge_request_diff_head_sha = params.delete(:merge_request_diff_head_sha) + note = project.notes.new(params) note.author = current_user note.system = false @@ -19,7 +21,8 @@ module Notes slash_commands_service = SlashCommandsService.new(project, current_user) if slash_commands_service.supported?(note) - content, command_params = slash_commands_service.extract_commands(note) + options = { merge_request_diff_head_sha: merge_request_diff_head_sha } + content, command_params = slash_commands_service.extract_commands(note, options) only_commands = content.empty? |