diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-04-12 14:34:50 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-04-12 14:34:50 +0000 |
| commit | e322b993e701f40fc515539cd58adec22a30c61d (patch) | |
| tree | 2c4bd7c94140fb3c5ae582985f7b9e376315e837 /app/controllers/projects/notes_controller.rb | |
| parent | a5512099cec6219261ac821775f0cc02e99bc1a6 (diff) | |
| parent | dc39c8372d760eceba50a35505dad8663b9e851e (diff) | |
| download | gitlab-ce-e322b993e701f40fc515539cd58adec22a30c61d.tar.gz | |
Merge branch 'api-delete-note' into 'master'
Delete notes via API
Supports deleting issues, snippets, and merge requests via the API.
* Closes #14944
* Closes #14845
* Closes #6060
@zj I did not see that you assigned yourself in #6060. Hopefully, you did not start yet.
@rymai In #6060 this is targeted for 8.7 release. Could you review that and maybe this still lands in 8.7.
See merge request !3557
Diffstat (limited to 'app/controllers/projects/notes_controller.rb')
| -rw-r--r-- | app/controllers/projects/notes_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 1b9dd568043..707a0d0e5c6 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -39,8 +39,7 @@ class Projects::NotesController < Projects::ApplicationController def destroy if note.editable? - note.destroy - note.reset_events_cache + Notes::DeleteService.new(project, current_user).execute(note) end respond_to do |format| |