diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-16 15:11:06 +0000 |
|---|---|---|
| committer | Tiago <tiagonbotelho@hotmail.com> | 2017-11-17 10:22:50 +0000 |
| commit | e049dfb52004e68ba2272979b7178613a7862550 (patch) | |
| tree | 0d70403734fc660156149e978e23f7e43833ece7 /app | |
| parent | 5a488a6ae3606bc11b8685ae4375a9cf04962ad0 (diff) | |
| download | gitlab-ce-e049dfb52004e68ba2272979b7178613a7862550.tar.gz | |
Merge branch 'dm-notes-actions-noteable-for-update' into 'master'
Make sure NotesActions#noteable returns a Noteable in the update action
Closes #40208
See merge request gitlab-org/gitlab-ce!15421
(cherry picked from commit 5fbda2af920a86e11696cae5b3397c3241f21b77)
f691010d Make sure NotesActions#noteable returns a Noteable in the update action
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/concerns/notes_actions.rb | 10 | ||||
| -rw-r--r-- | app/controllers/snippets/notes_controller.rb | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app/controllers/concerns/notes_actions.rb b/app/controllers/concerns/notes_actions.rb index 3c64fd964ff..be2e1b47feb 100644 --- a/app/controllers/concerns/notes_actions.rb +++ b/app/controllers/concerns/notes_actions.rb @@ -4,7 +4,7 @@ module NotesActions included do before_action :set_polling_interval_header, only: [:index] - before_action :noteable, only: :index + before_action :require_noteable!, only: [:index, :create] before_action :authorize_admin_note!, only: [:update, :destroy] before_action :note_project, only: [:create] end @@ -90,7 +90,7 @@ module NotesActions if note.persisted? attrs[:valid] = true - if noteable.nil? || noteable.discussions_rendered_on_frontend? + if noteable.discussions_rendered_on_frontend? attrs.merge!(note_serializer.represent(note)) else attrs.merge!( @@ -191,7 +191,11 @@ module NotesActions end def noteable - @noteable ||= notes_finder.target || render_404 + @noteable ||= notes_finder.target || @note&.noteable + end + + def require_noteable! + render_404 unless noteable end def last_fetched_at diff --git a/app/controllers/snippets/notes_controller.rb b/app/controllers/snippets/notes_controller.rb index f9496787b15..c8b4682e6dc 100644 --- a/app/controllers/snippets/notes_controller.rb +++ b/app/controllers/snippets/notes_controller.rb @@ -20,6 +20,7 @@ class Snippets::NotesController < ApplicationController def snippet PersonalSnippet.find_by(id: params[:snippet_id]) end + alias_method :noteable, :snippet def note_params super.merge(noteable_id: params[:snippet_id]) |