-
- Downloads
Merge branch '24915_merge_slash_command' into 'master'
Support `/merge` slash command for MRs Closes #24915 See merge request !7746
Showing
- app/assets/javascripts/notes.js 12 additions, 0 deletionsapp/assets/javascripts/notes.js
- app/controllers/projects/merge_requests_controller.rb 10 additions, 0 deletionsapp/controllers/projects/merge_requests_controller.rb
- app/controllers/projects/notes_controller.rb 2 additions, 1 deletionapp/controllers/projects/notes_controller.rb
- app/helpers/merge_requests_helper.rb 8 additions, 0 deletionsapp/helpers/merge_requests_helper.rb
- app/models/merge_request.rb 13 additions, 1 deletionapp/models/merge_request.rb
- app/services/merge_requests/update_service.rb 15 additions, 0 deletionsapp/services/merge_requests/update_service.rb
- app/services/notes/create_service.rb 4 additions, 1 deletionapp/services/notes/create_service.rb
- app/services/notes/slash_commands_service.rb 2 additions, 2 deletionsapp/services/notes/slash_commands_service.rb
- app/services/slash_commands/interpret_service.rb 14 additions, 2 deletionsapp/services/slash_commands/interpret_service.rb
- app/views/projects/merge_requests/_show.html.haml 3 additions, 0 deletionsapp/views/projects/merge_requests/_show.html.haml
- app/views/projects/notes/_form.html.haml 1 addition, 0 deletionsapp/views/projects/notes/_form.html.haml
- changelogs/unreleased/24915_merge_slash_command.yml 4 additions, 0 deletionschangelogs/unreleased/24915_merge_slash_command.yml
- config/routes/project.rb 1 addition, 0 deletionsconfig/routes/project.rb
- doc/user/project/slash_commands.md 1 addition, 0 deletionsdoc/user/project/slash_commands.md
- spec/controllers/projects/merge_requests_controller_spec.rb 68 additions, 0 deletionsspec/controllers/projects/merge_requests_controller_spec.rb
- spec/controllers/projects/notes_controller_spec.rb 48 additions, 0 deletionsspec/controllers/projects/notes_controller_spec.rb
- spec/features/merge_requests/user_uses_slash_commands_spec.rb 45 additions, 0 deletions.../features/merge_requests/user_uses_slash_commands_spec.rb
- spec/helpers/merge_requests_helper_spec.rb 15 additions, 0 deletionsspec/helpers/merge_requests_helper_spec.rb
- spec/models/merge_request_spec.rb 102 additions, 0 deletionsspec/models/merge_request_spec.rb
- spec/services/merge_requests/update_service_spec.rb 93 additions, 0 deletionsspec/services/merge_requests/update_service_spec.rb
Loading
Please register or sign in to comment