diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-05 20:06:05 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-05 20:06:05 +0300 |
| commit | f103475766fecc6e6fdf996e9cfaaa41e795962f (patch) | |
| tree | 01143342ee8aa80a6d0c238854cc229d8cd2a1fb /app | |
| parent | 9685ab323ef9c3138734de6df456afcc9bd7463e (diff) | |
| parent | 07f516d167b935acce6289a656872bad9a88b0ac (diff) | |
Merge branch 'osw-44295-adjust-authorization-for-discussions-show' into 'master'
Adjust 404's for LegacyDiffNote discussion rendering
Closes #44295
See merge request gitlab-org/gitlab-ce!18201
Diffstat (limited to 'app')
| -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) |