From 842486f5c812a5a1c7eb585a14f7acbee92ad3a6 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Sun, 27 Nov 2016 22:12:02 +0800 Subject: WIP --- app/controllers/projects/discussions_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/projects/discussions_controller.rb') diff --git a/app/controllers/projects/discussions_controller.rb b/app/controllers/projects/discussions_controller.rb index d174e1145a7..a8b7267274f 100644 --- a/app/controllers/projects/discussions_controller.rb +++ b/app/controllers/projects/discussions_controller.rb @@ -30,7 +30,7 @@ class Projects::DiscussionsController < Projects::ApplicationController end def discussion - @discussion ||= @merge_request.find_diff_discussion(params[:id]) || render_404 + @discussion ||= @merge_request.find_discussion(params[:id]) || render_404 end def authorize_resolve_discussion! -- cgit v1.2.1