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
40 lines
1.1 KiB
Ruby
40 lines
1.1 KiB
Ruby
require "base64"
|
|
|
|
class Projects::CommitsController < Projects::ApplicationController
|
|
include ExtractsPath
|
|
|
|
before_action :require_non_empty_project
|
|
before_action :assign_ref_vars
|
|
before_action :authorize_download_code!
|
|
|
|
def show
|
|
@limit, @offset = (params[:limit] || 40).to_i, (params[:offset] || 0).to_i
|
|
search = params[:search]
|
|
|
|
@commits =
|
|
if search.present?
|
|
@repository.find_commits_by_message(search, @ref, @path, @limit, @offset)
|
|
else
|
|
@repository.commits(@ref, path: @path, limit: @limit, offset: @offset)
|
|
end
|
|
|
|
@note_counts = project.notes.where(commit_id: @commits.map(&:id)).
|
|
group(:commit_id).count
|
|
|
|
@merge_request = MergeRequestsFinder.new(current_user, project_id: @project.id).execute.opened.
|
|
find_by(source_project: @project, source_branch: @ref, target_branch: @repository.root_ref)
|
|
|
|
respond_to do |format|
|
|
format.html
|
|
format.atom { render layout: false }
|
|
|
|
format.json do
|
|
pager_json(
|
|
'projects/commits/_commits',
|
|
@commits.size,
|
|
project: @project,
|
|
ref: @ref)
|
|
end
|
|
end
|
|
end
|
|
end
|