diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-04-05 17:23:57 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-04-05 18:13:42 +0300 |
| commit | 07f516d167b935acce6289a656872bad9a88b0ac (patch) | |
| tree | a7efacbe1337f02eb2532ea1e1c968f5ef1f642e /app/controllers/projects/discussions_controller.rb | |
| parent | 166b4575a6353668c894fea0ba234d0b371dee03 (diff) | |
Adjust 404's for LegacyDiffNote discussion rendering
Diffstat (limited to 'app/controllers/projects/discussions_controller.rb')
| -rw-r--r-- | app/controllers/projects/discussions_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/discussions_controller.rb b/app/controllers/projects/discussions_controller.rb index 7bc16214010..8e86af43fee 100644 --- a/app/controllers/projects/discussions_controller.rb +++ b/app/controllers/projects/discussions_controller.rb @@ -4,8 +4,8 @@ class Projects::DiscussionsController < Projects::ApplicationController before_action :check_merge_requests_available! before_action :merge_request - before_action :discussion - before_action :authorize_resolve_discussion! + before_action :discussion, only: [:resolve, :unresolve] + before_action :authorize_resolve_discussion!, only: [:resolve, :unresolve] def resolve Discussions::ResolveService.new(project, current_user, merge_request: merge_request).execute(discussion) |