kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Check the discussion lock only for issuables & clean style

This commit is contained in:
Jarka Kadlecova 2017-08-31 14:31:14 +02:00
parent 3d2917bf2e
commit 2b82f907ab
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/projects/notes_controller.rb
View File

@ -77,7 +77,7 @@ class Projects::NotesController < Projects::ApplicationController
def authorize_create_note!
noteable_type = note_params[:noteable_type]
return unless ['MergeRequest', 'Issue'].include?(noteable_type)
return unless %w[MergeRequest Issue].include?(noteable_type)
return access_denied! unless can?(current_user, :create_note, project)
noteable = noteable_type.constantize.find(note_params[:noteable_id])

2
app/policies/note_policy.rb
View File

@ -7,7 +7,7 @@ class NotePolicy < BasePolicy
condition(:is_noteable_author) { @user && @subject.noteable.author_id == @user.id }
condition(:editable, scope: :subject) { @subject.editable? }
condition(:locked) { @subject.noteable.discussion_locked? }
condition(:locked) { [MergeRequest, Issue].include?(@subject.noteable.class) && @subject.noteable.discussion_locked? }
rule { ~editable | anonymous }.prevent :edit_note

4
spec/controllers/projects/notes_controller_spec.rb
View File

@ -253,7 +253,7 @@ describe Projects::NotesController do
end
it 'creates a new note' do
expect{ post :create, request_params }.to change { Note.count }.by(1)
expect { post :create, request_params }.to change { Note.count }.by(1)
end
end
@ -269,7 +269,7 @@ describe Projects::NotesController do
end
it 'does not create a new note' do
expect{ post :create, request_params }.not_to change { Note.count }
expect { post :create, request_params }.not_to change { Note.count }
end
end
end