diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-08-13 00:24:09 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-08-13 00:24:09 +0300 |
| commit | e25720045988e59f7ddfecebbc02e640dc2f8360 (patch) | |
| tree | 1555fa2bd5b07d3495032c1fdd0ecce6cb222254 /app/controllers/projects/discussions_controller.rb | |
| parent | f48642e260e7cc733b619e34e47d6e67b484fee0 (diff) | |
Add specs for NotesController and DiscussionsController
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 86e3f865c6f..502aa20d7b6 100644 --- a/app/controllers/projects/discussions_controller.rb +++ b/app/controllers/projects/discussions_controller.rb @@ -34,7 +34,7 @@ class Projects::DiscussionsController < Projects::ApplicationController end def discussion - @discussion ||= @merge_request.discussions.find { |d| d.id == params[:id] } || render_404 + @discussion ||= @merge_request.find_discussion(params[:id]) || render_404 end def authorize_resolve_discussion! |