diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-11-27 22:12:02 +0800 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-11-30 17:46:46 +0800 |
| commit | 842486f5c812a5a1c7eb585a14f7acbee92ad3a6 (patch) | |
| tree | 5c64aca547dd08308c9bb755636c16cce60803c1 /app/controllers/projects/discussions_controller.rb | |
| parent | 098066050d148deb024fdec6c36bfe9320c674bd (diff) | |
| download | gitlab-ce-new-resolvable-discussion.tar.gz | |
Diffstat (limited to 'app/controllers/projects/discussions_controller.rb')
| -rw-r--r-- | app/controllers/projects/discussions_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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! |