From f554aa38d504387aae09d4000bd208078e1c3c1b Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 25 Dec 2013 22:32:48 +0200
Subject: [PATCH] Update commentable controllers with new note vars
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
app/controllers/projects/commit_controller.rb | 3 +--
app/controllers/projects/issues_controller.rb | 3 +--
app/controllers/projects/merge_requests_controller.rb | 3 +--
app/controllers/projects/snippets_controller.rb | 3 +--
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 34cd1341f78..65b8a7283a7 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -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',
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 81f21fa0c59..c58ac71277e 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -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
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index c542f31f006..bba08bdd782 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -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
diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb
index 4db0bc34b53..f93f2d5f9bb 100644
--- a/app/controllers/projects/snippets_controller.rb
+++ b/app/controllers/projects/snippets_controller.rb
@@ -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
--
GitLab