f23b1cb453
Replace MR access checks with use of MergeRequestsFinder Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867 ⚠️ - Potentially untested 💣 - No test coverage 🚥 - Test coverage of some sort exists (a test failed when error raised) 🚦 - Test coverage of return value (a test failed when nil used) ✅ - Permissions check tested - [x] 💣 app/finders/notes_finder.rb:17 - [x] ⚠️ app/views/layouts/nav/_project.html.haml:80 [`.count`] - [x] 💣 app/controllers/concerns/creates_commit.rb:84 - [x] 🚥 app/controllers/projects/commits_controller.rb:24 - [x] 🚥 app/controllers/projects/compare_controller.rb:56 - [x] 🚦 app/controllers/projects/discussions_controller.rb:29 - [x] ✅ app/controllers/projects/todos_controller.rb:27 - [x] 🚦 app/models/commit.rb:268 - [x] ✅ lib/gitlab/search_results.rb:71 - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_267_266 Memoize ` merged_merge_request(current_user)` - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_248_247 Expected side effect for `merged_merge_request!`, consider `skip_authorization: true`. - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_269_269 Scary use of unchecked `merged_merge_request?` See merge request !2033
41 lines
1.2 KiB
Ruby
41 lines
1.2 KiB
Ruby
class Projects::DiscussionsController < Projects::ApplicationController
|
|
before_action :module_enabled
|
|
before_action :merge_request
|
|
before_action :discussion
|
|
before_action :authorize_resolve_discussion!
|
|
|
|
def resolve
|
|
Discussions::ResolveService.new(project, current_user, merge_request: merge_request).execute(discussion)
|
|
|
|
render json: {
|
|
resolved_by: discussion.resolved_by.try(:name),
|
|
discussion_headline_html: view_to_html_string('discussions/_headline', discussion: discussion)
|
|
}
|
|
end
|
|
|
|
def unresolve
|
|
discussion.unresolve!
|
|
|
|
render json: {
|
|
discussion_headline_html: view_to_html_string('discussions/_headline', discussion: discussion)
|
|
}
|
|
end
|
|
|
|
private
|
|
|
|
def merge_request
|
|
@merge_request ||= MergeRequestsFinder.new(current_user, project_id: @project.id).find_by!(iid: params[:merge_request_id])
|
|
end
|
|
|
|
def discussion
|
|
@discussion ||= @merge_request.find_diff_discussion(params[:id]) || render_404
|
|
end
|
|
|
|
def authorize_resolve_discussion!
|
|
access_denied! unless discussion.can_resolve?(current_user)
|
|
end
|
|
|
|
def module_enabled
|
|
render_404 unless @project.feature_available?(:merge_requests, current_user)
|
|
end
|
|
end
|