Skip to content
Snippets Groups Projects
Verified Commit f554aa38 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Update commentable controllers with new note vars

parent 48c682b5
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -24,9 +24,8 @@ class Projects::CommitController < Projects::ApplicationController
@line_notes = result[:line_notes]
@branches = result[:branches]
@notes_count = result[:notes_count]
@target_type = "Commit"
@notes = project.notes.for_commit_id(@commit.id).not_inline.fresh
@target_id = @commit.id
@noteable = @commit
 
@comments_allowed = @reply_allowed = true
@comments_target = { noteable_type: 'Commit',
Loading
Loading
Loading
Loading
@@ -50,8 +50,7 @@ class Projects::IssuesController < Projects::ApplicationController
def show
@note = @project.notes.new(noteable: @issue)
@notes = @issue.notes.inc_author.fresh
@target_type = 'Issue'
@target_id = @issue.id
@noteable = @issue
 
respond_with(@issue)
end
Loading
Loading
Loading
Loading
@@ -200,8 +200,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@note = @project.notes.new(noteable: @merge_request)
@notes = @merge_request.mr_and_commit_notes.inc_author.fresh
@discussions = Note.discussions_from_notes(@notes)
@target_type = 'MergeRequest'
@target_id = @merge_request.id
@noteable = @merge_request
 
# Get commits from repository
# or from cache if already merged
Loading
Loading
Loading
Loading
@@ -49,8 +49,7 @@ class Projects::SnippetsController < Projects::ApplicationController
def show
@note = @project.notes.new(noteable: @snippet)
@notes = @snippet.notes.fresh
@target_type = 'Snippet'
@target_id = @snippet.id
@noteable = @snippet
end
 
def destroy
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment