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
59 lines
1.5 KiB
Ruby
59 lines
1.5 KiB
Ruby
require 'addressable/uri'
|
|
|
|
class Projects::CompareController < Projects::ApplicationController
|
|
include DiffForPath
|
|
include DiffHelper
|
|
|
|
# Authorize
|
|
before_action :require_non_empty_project
|
|
before_action :authorize_download_code!
|
|
before_action :define_ref_vars, only: [:index, :show, :diff_for_path]
|
|
before_action :define_diff_vars, only: [:show, :diff_for_path]
|
|
before_action :merge_request, only: [:index, :show]
|
|
|
|
def index
|
|
end
|
|
|
|
def show
|
|
apply_diff_view_cookie!
|
|
end
|
|
|
|
def diff_for_path
|
|
return render_404 unless @compare
|
|
|
|
render_diff_for_path(@compare.diffs(diff_options))
|
|
end
|
|
|
|
def create
|
|
redirect_to namespace_project_compare_path(@project.namespace, @project,
|
|
params[:from], params[:to])
|
|
end
|
|
|
|
private
|
|
|
|
def define_ref_vars
|
|
@start_ref = Addressable::URI.unescape(params[:from])
|
|
@ref = @head_ref = Addressable::URI.unescape(params[:to])
|
|
end
|
|
|
|
def define_diff_vars
|
|
@compare = CompareService.new.execute(@project, @head_ref, @project, @start_ref)
|
|
|
|
if @compare
|
|
@commits = @compare.commits
|
|
@start_commit = @compare.start_commit
|
|
@commit = @compare.commit
|
|
@base_commit = @compare.base_commit
|
|
|
|
@diffs = @compare.diffs(diff_options)
|
|
|
|
@diff_notes_disabled = true
|
|
@grouped_diff_discussions = {}
|
|
end
|
|
end
|
|
|
|
def merge_request
|
|
@merge_request ||= MergeRequestsFinder.new(current_user, project_id: @project.id).execute.opened.
|
|
find_by(source_project: @project, source_branch: @head_ref, target_branch: @start_ref)
|
|
end
|
|
end
|