2018-08-18 11:19:57 +00:00
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2011-10-08 21:36:38 +00:00
|
|
|
module CommitsHelper
|
2013-03-31 20:46:54 +00:00
|
|
|
# Returns a link to the commit author. If the author has a matching user and
|
|
|
|
# is a member of the current @project it will link to the team member page.
|
|
|
|
# Otherwise it will link to the author email as specified in the commit.
|
|
|
|
#
|
|
|
|
# options:
|
|
|
|
# avatar: true will prepend the avatar image
|
|
|
|
# size: size of the avatar image in px
|
|
|
|
def commit_author_link(commit, options = {})
|
|
|
|
commit_person_link(commit, options.merge(source: :author))
|
|
|
|
end
|
|
|
|
|
|
|
|
# Just like #author_link but for the committer.
|
|
|
|
def commit_committer_link(commit, options = {})
|
|
|
|
commit_person_link(commit, options.merge(source: :committer))
|
|
|
|
end
|
|
|
|
|
2021-09-22 09:11:53 +00:00
|
|
|
def commit_committer_avatar(committer, options = {})
|
|
|
|
user_avatar(options.merge({
|
|
|
|
user: committer,
|
|
|
|
user_name: committer.name,
|
|
|
|
user_email: committer.email,
|
|
|
|
css_class: 'd-none d-sm-inline-block float-none gl-mr-0! gl-vertical-align-text-bottom'
|
|
|
|
}))
|
|
|
|
end
|
|
|
|
|
2016-10-21 08:22:43 +00:00
|
|
|
def commit_to_html(commit, ref, project)
|
2020-01-31 12:08:33 +00:00
|
|
|
render 'projects/commits/commit.html',
|
2016-10-21 08:22:43 +00:00
|
|
|
commit: commit,
|
|
|
|
ref: ref,
|
|
|
|
project: project
|
2012-10-31 12:29:42 +00:00
|
|
|
end
|
2012-12-25 03:14:05 +00:00
|
|
|
|
2013-03-31 20:46:54 +00:00
|
|
|
# Breadcrumb links for a Project and, if applicable, a tree path
|
|
|
|
def commits_breadcrumbs
|
|
|
|
return unless @project && @ref
|
|
|
|
|
|
|
|
# Add the root project link and the arrow icon
|
2018-04-09 17:28:47 +00:00
|
|
|
crumbs = content_tag(:li, class: 'breadcrumb-item') do
|
2015-01-24 18:02:58 +00:00
|
|
|
link_to(
|
|
|
|
@project.path,
|
2017-06-29 17:06:35 +00:00
|
|
|
project_commits_path(@project, @ref)
|
2015-01-24 18:02:58 +00:00
|
|
|
)
|
2013-03-31 20:46:54 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
if @path
|
|
|
|
parts = @path.split('/')
|
|
|
|
|
|
|
|
parts.each_with_index do |part, i|
|
2018-04-09 17:28:47 +00:00
|
|
|
crumbs << content_tag(:li, class: 'breadcrumb-item') do
|
2013-03-31 20:46:54 +00:00
|
|
|
# The text is just the individual part, but the link needs all the parts before it
|
2015-01-24 18:02:58 +00:00
|
|
|
link_to(
|
|
|
|
part,
|
2017-06-29 17:06:35 +00:00
|
|
|
project_commits_path(
|
2015-01-24 18:02:58 +00:00
|
|
|
@project,
|
|
|
|
tree_join(@ref, parts[0..i].join('/'))
|
|
|
|
)
|
|
|
|
)
|
2013-03-31 20:46:54 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
crumbs.html_safe
|
|
|
|
end
|
|
|
|
|
2013-10-15 12:59:48 +00:00
|
|
|
# Return Project default branch, if it present in array
|
|
|
|
# Else - first branch in array (mb last actual branch)
|
|
|
|
def commit_default_branch(project, branches)
|
|
|
|
branches.include?(project.default_branch) ? branches.delete(project.default_branch) : branches.pop
|
|
|
|
end
|
|
|
|
|
2017-11-01 23:09:48 +00:00
|
|
|
# Returns a link formatted as a commit branch link
|
2017-10-12 13:31:43 +00:00
|
|
|
def commit_branch_link(url, text)
|
2018-04-13 19:46:38 +00:00
|
|
|
link_to(url, class: 'badge badge-gray ref-name branch-link') do
|
2018-05-24 17:17:52 +00:00
|
|
|
sprite_icon('branch', size: 12, css_class: 'fork-svg') + "#{text}"
|
2017-10-12 13:31:43 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2013-10-15 12:59:48 +00:00
|
|
|
# Returns the sorted alphabetically links to branches, separated by a comma
|
|
|
|
def commit_branches_links(project, branches)
|
2015-01-22 19:15:21 +00:00
|
|
|
branches.sort.map do |branch|
|
2017-10-12 13:31:43 +00:00
|
|
|
commit_branch_link(project_ref_path(project, branch), branch)
|
|
|
|
end.join(' ').html_safe
|
|
|
|
end
|
|
|
|
|
2017-11-01 23:09:48 +00:00
|
|
|
# Returns a link formatted as a commit tag link
|
2017-10-12 13:31:43 +00:00
|
|
|
def commit_tag_link(url, text)
|
2018-04-13 19:46:38 +00:00
|
|
|
link_to(url, class: 'badge badge-gray ref-name') do
|
2020-07-08 21:09:09 +00:00
|
|
|
sprite_icon('tag', size: 12, css_class: 'gl-mr-2 vertical-align-middle') + "#{text}"
|
2017-10-12 13:31:43 +00:00
|
|
|
end
|
2013-10-15 12:59:48 +00:00
|
|
|
end
|
|
|
|
|
2015-01-17 13:12:49 +00:00
|
|
|
# Returns the sorted links to tags, separated by a comma
|
|
|
|
def commit_tags_links(project, tags)
|
|
|
|
sorted = VersionSorter.rsort(tags)
|
2015-01-22 19:15:21 +00:00
|
|
|
sorted.map do |tag|
|
2017-10-12 13:31:43 +00:00
|
|
|
commit_tag_link(project_ref_path(project, tag), tag)
|
|
|
|
end.join(' ').html_safe
|
2015-01-17 13:12:49 +00:00
|
|
|
end
|
|
|
|
|
2014-07-08 15:28:02 +00:00
|
|
|
def link_to_browse_code(project, commit)
|
2017-05-16 23:44:54 +00:00
|
|
|
return unless current_controller?(:commits)
|
2017-05-08 23:58:54 +00:00
|
|
|
|
2016-08-17 15:02:17 +00:00
|
|
|
if @path.blank?
|
2018-04-06 13:35:07 +00:00
|
|
|
url = project_tree_path(project, commit)
|
|
|
|
tooltip = _("Browse Files")
|
2017-05-08 23:58:54 +00:00
|
|
|
elsif @repo.blob_at(commit.id, @path)
|
2018-04-06 13:35:07 +00:00
|
|
|
url = project_blob_path(project, tree_join(commit.id, @path))
|
|
|
|
tooltip = _("Browse File")
|
2016-08-17 15:02:17 +00:00
|
|
|
elsif @path.present?
|
2018-04-06 13:35:07 +00:00
|
|
|
url = project_tree_path(project, tree_join(commit.id, @path))
|
|
|
|
tooltip = _("Browse Directory")
|
|
|
|
end
|
|
|
|
|
2021-02-19 18:10:51 +00:00
|
|
|
link_to url, class: "btn gl-button btn-default btn-icon has-tooltip", title: tooltip, data: { container: "body" } do
|
2018-04-06 13:35:07 +00:00
|
|
|
sprite_icon('folder-open')
|
2014-07-08 15:28:02 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2021-03-23 15:09:28 +00:00
|
|
|
def commit_options_dropdown_data(project, commit)
|
|
|
|
can_collaborate = current_user && can_collaborate_with_project?(project)
|
|
|
|
|
|
|
|
{
|
|
|
|
new_project_tag_path: new_project_tag_path(project, ref: commit),
|
|
|
|
email_patches_path: project_commit_path(project, commit, format: :patch),
|
|
|
|
plain_diff_path: project_commit_path(project, commit, format: :diff),
|
|
|
|
can_revert: "#{can_collaborate && !commit.has_been_reverted?(current_user)}",
|
|
|
|
can_cherry_pick: can_collaborate.to_s,
|
|
|
|
can_tag: can?(current_user, :push_code, project).to_s,
|
|
|
|
can_email_patches: (commit.parents.length < 2).to_s
|
|
|
|
}
|
2016-02-03 21:11:59 +00:00
|
|
|
end
|
|
|
|
|
2017-07-25 07:40:23 +00:00
|
|
|
def commit_signature_badge_classes(additional_classes)
|
2017-08-23 15:09:22 +00:00
|
|
|
%w(btn gpg-status-box) + Array(additional_classes)
|
2017-07-25 07:40:23 +00:00
|
|
|
end
|
|
|
|
|
2021-04-20 21:09:07 +00:00
|
|
|
def conditionally_paginate_diff_files(diffs, paginate:, per:)
|
2021-02-19 12:11:06 +00:00
|
|
|
if paginate
|
2021-02-10 09:09:38 +00:00
|
|
|
Kaminari.paginate_array(diffs.diff_files.to_a).page(params[:page]).per(per)
|
|
|
|
else
|
|
|
|
diffs.diff_files
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2021-03-15 21:09:16 +00:00
|
|
|
def cherry_pick_projects_data(project)
|
2021-04-12 21:11:12 +00:00
|
|
|
[project, project.forked_from_project].compact.map do |project|
|
2021-03-15 21:09:16 +00:00
|
|
|
{
|
|
|
|
id: project.id.to_s,
|
|
|
|
name: project.full_path,
|
|
|
|
refsUrl: refs_project_path(project)
|
|
|
|
}
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2021-05-14 15:10:35 +00:00
|
|
|
# This is used to calculate a cache key for the app/views/projects/commits/_commit.html.haml
|
|
|
|
# partial. It takes some of the same parameters as used in the partial and will hash the
|
|
|
|
# current pipeline status.
|
|
|
|
#
|
|
|
|
# This includes a keyed hash for values that can be nil, to prevent invalid cache entries
|
|
|
|
# being served if the order should change in future.
|
|
|
|
def commit_partial_cache_key(commit, ref:, merge_request:, request:)
|
|
|
|
[
|
|
|
|
commit,
|
|
|
|
commit.author,
|
|
|
|
ref,
|
|
|
|
{
|
2021-05-19 21:12:42 +00:00
|
|
|
merge_request: merge_request&.cache_key,
|
|
|
|
pipeline_status: commit.status_for(ref)&.cache_key,
|
2021-05-14 15:10:35 +00:00
|
|
|
xhr: request.xhr?,
|
|
|
|
controller: controller.controller_path,
|
|
|
|
path: @path # referred to in #link_to_browse_code
|
|
|
|
}
|
|
|
|
]
|
|
|
|
end
|
|
|
|
|
2021-06-25 03:07:34 +00:00
|
|
|
DEFAULT_SHA = '0000000'
|
|
|
|
|
|
|
|
# Returns the template path for commit resources
|
|
|
|
# to be utilized by the client applications.
|
|
|
|
def commit_path_template(project)
|
|
|
|
project_commit_path(project, DEFAULT_SHA).sub("/#{DEFAULT_SHA}", '/$COMMIT_SHA')
|
|
|
|
end
|
|
|
|
|
2013-03-31 20:46:54 +00:00
|
|
|
protected
|
|
|
|
|
|
|
|
# Private: Returns a link to a person. If the person has a matching user and
|
|
|
|
# is a member of the current @project it will link to the team member page.
|
|
|
|
# Otherwise it will link to the person email as specified in the commit.
|
|
|
|
#
|
|
|
|
# options:
|
|
|
|
# source: one of :author or :committer
|
|
|
|
# avatar: true will prepend the avatar image
|
|
|
|
# size: size of the avatar image in px
|
|
|
|
def commit_person_link(commit, options = {})
|
2017-08-10 16:39:26 +00:00
|
|
|
user = commit.public_send(options[:source]) # rubocop:disable GitlabSecurity/PublicSend
|
2015-09-23 10:18:16 +00:00
|
|
|
|
2021-01-21 18:09:11 +00:00
|
|
|
source_name = clean(commit.public_send(:"#{options[:source]}_name")) # rubocop:disable GitlabSecurity/PublicSend
|
2017-08-10 16:39:26 +00:00
|
|
|
source_email = clean(commit.public_send(:"#{options[:source]}_email")) # rubocop:disable GitlabSecurity/PublicSend
|
2014-06-14 16:02:16 +00:00
|
|
|
|
2015-03-27 11:16:34 +00:00
|
|
|
person_name = user.try(:name) || source_name
|
2014-06-14 16:02:16 +00:00
|
|
|
|
2015-02-03 05:38:50 +00:00
|
|
|
text =
|
|
|
|
if options[:avatar]
|
2017-09-04 10:28:30 +00:00
|
|
|
content_tag(:span, person_name, class: "commit-#{options[:source]}-name")
|
2015-02-03 05:38:50 +00:00
|
|
|
else
|
|
|
|
person_name
|
|
|
|
end
|
2013-03-31 20:46:54 +00:00
|
|
|
|
2018-07-17 15:28:20 +00:00
|
|
|
link_options = {
|
2018-07-20 11:04:54 +00:00
|
|
|
class: "commit-#{options[:source]}-link"
|
2013-07-27 07:40:38 +00:00
|
|
|
}
|
2018-07-20 11:04:54 +00:00
|
|
|
|
2013-03-31 20:46:54 +00:00
|
|
|
if user.nil?
|
2018-07-17 15:28:20 +00:00
|
|
|
mail_to(source_email, text, link_options)
|
2013-03-31 20:46:54 +00:00
|
|
|
else
|
2019-01-04 23:42:18 +00:00
|
|
|
link_to(text, user_path(user), { class: "commit-#{options[:source]}-link js-user-link", data: { user_id: user.id } })
|
2013-03-31 20:46:54 +00:00
|
|
|
end
|
|
|
|
end
|
2014-06-14 19:54:56 +00:00
|
|
|
|
2017-09-20 14:39:12 +00:00
|
|
|
def view_file_button(commit_sha, diff_new_path, project, replaced: false)
|
2020-07-02 15:09:08 +00:00
|
|
|
path = project_blob_path(project, tree_join(commit_sha, diff_new_path))
|
2017-09-20 14:39:12 +00:00
|
|
|
title = replaced ? _('View replaced file @ ') : _('View file @ ')
|
|
|
|
|
2021-08-02 09:10:09 +00:00
|
|
|
link_to(path, class: 'btn gl-button btn-default gl-ml-3') do
|
2020-07-02 15:09:08 +00:00
|
|
|
raw(title) + content_tag(:span, truncate_sha(commit_sha), class: 'commit-sha')
|
2014-08-02 15:12:01 +00:00
|
|
|
end
|
|
|
|
end
|
2014-10-10 12:39:48 +00:00
|
|
|
|
2017-02-07 00:06:46 +00:00
|
|
|
def view_on_environment_button(commit_sha, diff_new_path, environment)
|
2017-01-29 19:38:00 +00:00
|
|
|
return unless environment && commit_sha
|
|
|
|
|
|
|
|
external_url = environment.external_url_for(diff_new_path, commit_sha)
|
|
|
|
return unless external_url
|
|
|
|
|
2021-01-30 00:09:06 +00:00
|
|
|
link_to(external_url, class: 'btn gl-button btn-default btn-file-option has-tooltip', target: '_blank', rel: 'noopener noreferrer', title: "View on #{environment.formatted_external_url}", data: { container: 'body' }) do
|
2020-10-21 18:08:58 +00:00
|
|
|
sprite_icon('external-link')
|
2017-01-29 19:38:00 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-10-10 12:39:48 +00:00
|
|
|
def truncate_sha(sha)
|
|
|
|
Commit.truncate_sha(sha)
|
|
|
|
end
|
2014-11-14 10:08:58 +00:00
|
|
|
|
|
|
|
def clean(string)
|
|
|
|
Sanitize.clean(string, remove_contents: true)
|
|
|
|
end
|
2016-03-04 14:45:58 +00:00
|
|
|
|
2017-06-29 21:19:09 +00:00
|
|
|
def commit_path(project, commit, merge_request: nil)
|
|
|
|
if merge_request&.persisted?
|
2017-11-14 16:48:40 +00:00
|
|
|
diffs_project_merge_request_path(project, merge_request, commit_id: commit.id)
|
2020-04-22 18:09:52 +00:00
|
|
|
elsif merge_request
|
|
|
|
project_commit_path(merge_request&.source_project, commit)
|
2017-06-29 21:19:09 +00:00
|
|
|
else
|
2017-11-14 16:48:40 +00:00
|
|
|
project_commit_path(project, commit)
|
2017-06-29 21:19:09 +00:00
|
|
|
end
|
|
|
|
end
|
2011-10-08 21:36:38 +00:00
|
|
|
end
|