2018-12-05 23:21:45 +05:30
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2014-09-02 18:07:02 +05:30
|
|
|
module CommitsHelper
|
|
|
|
# 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
|
|
|
|
|
2016-11-24 13:41:30 +05:30
|
|
|
def commit_to_html(commit, ref, project)
|
2020-03-09 13:42:32 +05:30
|
|
|
render 'projects/commits/commit.html',
|
2016-11-24 13:41:30 +05:30
|
|
|
commit: commit,
|
|
|
|
ref: ref,
|
|
|
|
project: project
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
# 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-11-08 19:23:39 +05:30
|
|
|
crumbs = content_tag(:li, class: 'breadcrumb-item') do
|
2015-04-26 12:48:37 +05:30
|
|
|
link_to(
|
|
|
|
@project.path,
|
2017-09-10 17:25:29 +05:30
|
|
|
project_commits_path(@project, @ref)
|
2015-04-26 12:48:37 +05:30
|
|
|
)
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
if @path
|
|
|
|
parts = @path.split('/')
|
|
|
|
|
|
|
|
parts.each_with_index do |part, i|
|
2018-11-08 19:23:39 +05:30
|
|
|
crumbs << content_tag(:li, class: 'breadcrumb-item') do
|
2014-09-02 18:07:02 +05:30
|
|
|
# The text is just the individual part, but the link needs all the parts before it
|
2015-04-26 12:48:37 +05:30
|
|
|
link_to(
|
|
|
|
part,
|
2017-09-10 17:25:29 +05:30
|
|
|
project_commits_path(
|
2015-04-26 12:48:37 +05:30
|
|
|
@project,
|
|
|
|
tree_join(@ref, parts[0..i].join('/'))
|
|
|
|
)
|
|
|
|
)
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
crumbs.html_safe
|
|
|
|
end
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
# Returns a link formatted as a commit branch link
|
|
|
|
def commit_branch_link(url, text)
|
2018-11-08 19:23:39 +05:30
|
|
|
link_to(url, class: 'badge badge-gray ref-name branch-link') do
|
|
|
|
sprite_icon('branch', size: 12, css_class: 'fork-svg') + "#{text}"
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-02 18:07:02 +05:30
|
|
|
# Returns the sorted alphabetically links to branches, separated by a comma
|
|
|
|
def commit_branches_links(project, branches)
|
2015-04-26 12:48:37 +05:30
|
|
|
branches.sort.map do |branch|
|
2018-03-17 18:26:18 +05:30
|
|
|
commit_branch_link(project_ref_path(project, branch), branch)
|
|
|
|
end.join(' ').html_safe
|
|
|
|
end
|
|
|
|
|
|
|
|
# Returns a link formatted as a commit tag link
|
|
|
|
def commit_tag_link(url, text)
|
2018-11-08 19:23:39 +05:30
|
|
|
link_to(url, class: 'badge badge-gray ref-name') do
|
2020-07-28 23:09:34 +05:30
|
|
|
sprite_icon('tag', size: 12, css_class: 'gl-mr-2 vertical-align-middle') + "#{text}"
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
2015-04-26 12:48:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
# Returns the sorted links to tags, separated by a comma
|
|
|
|
def commit_tags_links(project, tags)
|
|
|
|
sorted = VersionSorter.rsort(tags)
|
|
|
|
sorted.map do |tag|
|
2018-03-17 18:26:18 +05:30
|
|
|
commit_tag_link(project_ref_path(project, tag), tag)
|
|
|
|
end.join(' ').html_safe
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
def link_to_browse_code(project, commit)
|
2017-09-10 17:25:29 +05:30
|
|
|
return unless current_controller?(:commits)
|
|
|
|
|
2016-09-13 17:45:13 +05:30
|
|
|
if @path.blank?
|
2018-05-09 12:01:36 +05:30
|
|
|
url = project_tree_path(project, commit)
|
|
|
|
tooltip = _("Browse Files")
|
2017-09-10 17:25:29 +05:30
|
|
|
elsif @repo.blob_at(commit.id, @path)
|
2018-05-09 12:01:36 +05:30
|
|
|
url = project_blob_path(project, tree_join(commit.id, @path))
|
|
|
|
tooltip = _("Browse File")
|
2016-09-13 17:45:13 +05:30
|
|
|
elsif @path.present?
|
2018-05-09 12:01:36 +05:30
|
|
|
url = project_tree_path(project, tree_join(commit.id, @path))
|
|
|
|
tooltip = _("Browse Directory")
|
|
|
|
end
|
|
|
|
|
|
|
|
link_to url, class: "btn btn-default has-tooltip", title: tooltip, data: { container: "body" } do
|
|
|
|
sprite_icon('folder-open')
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-06-16 23:09:34 +05:30
|
|
|
def revert_commit_link(commit, continue_to_path, btn_class: nil, has_tooltip: true)
|
2017-08-17 22:00:37 +05:30
|
|
|
commit_action_link('revert', commit, continue_to_path, btn_class: btn_class, has_tooltip: has_tooltip)
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
2016-06-16 23:09:34 +05:30
|
|
|
def cherry_pick_commit_link(commit, continue_to_path, btn_class: nil, has_tooltip: true)
|
2017-08-17 22:00:37 +05:30
|
|
|
commit_action_link('cherry-pick', commit, continue_to_path, btn_class: btn_class, has_tooltip: has_tooltip)
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
2017-09-10 17:25:29 +05:30
|
|
|
def commit_signature_badge_classes(additional_classes)
|
|
|
|
%w(btn gpg-status-box) + Array(additional_classes)
|
|
|
|
end
|
|
|
|
|
2014-09-02 18:07:02 +05:30
|
|
|
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 = {})
|
2018-03-17 18:26:18 +05:30
|
|
|
user = commit.public_send(options[:source]) # rubocop:disable GitlabSecurity/PublicSend
|
2015-10-24 18:46:33 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
source_name = clean(commit.public_send(:"#{options[:source]}_name")) # rubocop:disable GitlabSecurity/PublicSend
|
|
|
|
source_email = clean(commit.public_send(:"#{options[:source]}_email")) # rubocop:disable GitlabSecurity/PublicSend
|
2015-04-26 12:48:37 +05:30
|
|
|
|
|
|
|
person_name = user.try(:name) || source_name
|
|
|
|
|
|
|
|
text =
|
|
|
|
if options[:avatar]
|
2017-09-10 17:25:29 +05:30
|
|
|
content_tag(:span, person_name, class: "commit-#{options[:source]}-name")
|
2015-04-26 12:48:37 +05:30
|
|
|
else
|
|
|
|
person_name
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-11-18 11:00:15 +05:30
|
|
|
link_options = {
|
|
|
|
class: "commit-#{options[:source]}-link"
|
2014-09-02 18:07:02 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
if user.nil?
|
2018-11-18 11:00:15 +05:30
|
|
|
mail_to(source_email, text, link_options)
|
2014-09-02 18:07:02 +05:30
|
|
|
else
|
2019-02-15 15:39:39 +05:30
|
|
|
link_to(text, user_path(user), { class: "commit-#{options[:source]}-link js-user-link", data: { user_id: user.id } })
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
def commit_action_link(action, commit, continue_to_path, btn_class: nil, has_tooltip: true)
|
|
|
|
return unless current_user
|
|
|
|
|
|
|
|
tooltip = "#{action.capitalize} this #{commit.change_type_title(current_user)} in a new merge request" if has_tooltip
|
|
|
|
btn_class = "btn btn-#{btn_class}" unless btn_class.nil?
|
|
|
|
|
2018-05-09 12:01:36 +05:30
|
|
|
if can_collaborate_with_project?(@project)
|
2017-08-17 22:00:37 +05:30
|
|
|
link_to action.capitalize, "#modal-#{action}-commit", 'data-toggle' => 'modal', 'data-container' => 'body', title: (tooltip if has_tooltip), class: "#{btn_class} #{'has-tooltip' if has_tooltip}"
|
|
|
|
elsif can?(current_user, :fork_project, @project)
|
|
|
|
continue_params = {
|
|
|
|
to: continue_to_path,
|
|
|
|
notice: "#{edit_in_new_fork_notice} Try to #{action} this commit again.",
|
|
|
|
notice_now: edit_in_new_fork_notice_now
|
|
|
|
}
|
2017-09-10 17:25:29 +05:30
|
|
|
fork_path = project_forks_path(@project,
|
2017-08-17 22:00:37 +05:30
|
|
|
namespace_key: current_user.namespace.id,
|
|
|
|
continue: continue_params)
|
|
|
|
|
|
|
|
link_to action.capitalize, fork_path, class: btn_class, method: :post, 'data-toggle' => 'tooltip', 'data-container' => 'body', title: (tooltip if has_tooltip)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
def view_file_button(commit_sha, diff_new_path, project, replaced: false)
|
2020-07-28 23:09:34 +05:30
|
|
|
path = project_blob_path(project, tree_join(commit_sha, diff_new_path))
|
2018-03-17 18:26:18 +05:30
|
|
|
title = replaced ? _('View replaced file @ ') : _('View file @ ')
|
|
|
|
|
2020-07-28 23:09:34 +05:30
|
|
|
link_to(path, class: 'btn') do
|
|
|
|
raw(title) + content_tag(:span, truncate_sha(commit_sha), class: 'commit-sha')
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|
|
|
|
end
|
2015-04-26 12:48:37 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
def view_on_environment_button(commit_sha, diff_new_path, environment)
|
|
|
|
return unless environment && commit_sha
|
|
|
|
|
|
|
|
external_url = environment.external_url_for(diff_new_path, commit_sha)
|
|
|
|
return unless external_url
|
|
|
|
|
|
|
|
link_to(external_url, class: 'btn btn-file-option has-tooltip', target: '_blank', rel: 'noopener noreferrer', title: "View on #{environment.formatted_external_url}", data: { container: 'body' }) do
|
2021-01-29 00:20:46 +05:30
|
|
|
sprite_icon('external-link')
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-04-26 12:48:37 +05:30
|
|
|
def truncate_sha(sha)
|
|
|
|
Commit.truncate_sha(sha)
|
|
|
|
end
|
|
|
|
|
|
|
|
def clean(string)
|
|
|
|
Sanitize.clean(string, remove_contents: true)
|
|
|
|
end
|
2016-06-02 11:05:42 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
def commit_path(project, commit, merge_request: nil)
|
|
|
|
if merge_request&.persisted?
|
|
|
|
diffs_project_merge_request_path(project, merge_request, commit_id: commit.id)
|
2020-05-24 23:13:21 +05:30
|
|
|
elsif merge_request
|
|
|
|
project_commit_path(merge_request&.source_project, commit)
|
2018-03-17 18:26:18 +05:30
|
|
|
else
|
|
|
|
project_commit_path(project, commit)
|
|
|
|
end
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|