6da1941553
Since Rails 5.0 `request.format` is being set depending on the route extension. In commits pages we pass a ref as a URL parameter. If the ref is an extension-like, Rails converts it and sets to `request.format`. E.g. if the ref is `some_branch.atom`, Rails starts responding with `atom` format, but it should response with `html` because `.atom` is the part of ref name, not the format. This commit explicitly sets `request.format` to `:html` when needed.
81 lines
2.4 KiB
Ruby
81 lines
2.4 KiB
Ruby
require "base64"
|
|
|
|
class Projects::CommitsController < Projects::ApplicationController
|
|
include ExtractsPath
|
|
include RendersCommits
|
|
|
|
before_action :whitelist_query_limiting
|
|
before_action :require_non_empty_project
|
|
before_action :assign_ref_vars
|
|
before_action :authorize_download_code!
|
|
before_action :set_commits
|
|
before_action :set_request_format, only: :show
|
|
|
|
def show
|
|
@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: 'xml.atom' }
|
|
|
|
format.json do
|
|
pager_json(
|
|
'projects/commits/_commits',
|
|
@commits.size,
|
|
project: @project,
|
|
ref: @ref)
|
|
end
|
|
end
|
|
end
|
|
|
|
def signatures
|
|
respond_to do |format|
|
|
format.json do
|
|
render json: {
|
|
signatures: @commits.select(&:has_signature?).map do |commit|
|
|
{
|
|
commit_sha: commit.sha,
|
|
html: view_to_html_string('projects/commit/_signature', signature: commit.signature)
|
|
}
|
|
end
|
|
}
|
|
end
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def set_commits
|
|
render_404 unless @path.empty? || request.format == :atom || @repository.blob_at(@commit.id, @path) || @repository.tree(@commit.id, @path).entries.present?
|
|
@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
|
|
|
|
@commits = @commits.with_pipeline_status
|
|
@commits = prepare_commits_for_rendering(@commits)
|
|
end
|
|
|
|
# Rails 5 sets request.format from the extension.
|
|
# Explicitly set to :html.
|
|
def set_request_format
|
|
request.format = :html if set_request_format?
|
|
end
|
|
|
|
# Rails 5 sets request.format from extension.
|
|
# In this case if the ref ends with `.atom`, it's expected to be the html response,
|
|
# not the atom one. So explicitly set request.format as :html to act like rails4.
|
|
def set_request_format?
|
|
request.format.to_s == "text/html" || @commits.ref.ends_with?("atom")
|
|
end
|
|
|
|
def whitelist_query_limiting
|
|
Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42330')
|
|
end
|
|
end
|