Show branches/tags as labels on commit page
This commit is contained in:
parent
7afa4d5791
commit
7411fb36c5
|
@ -62,13 +62,27 @@ module CommitsHelper
|
||||||
|
|
||||||
# Returns the sorted alphabetically links to branches, separated by a comma
|
# Returns the sorted alphabetically links to branches, separated by a comma
|
||||||
def commit_branches_links(project, branches)
|
def commit_branches_links(project, branches)
|
||||||
branches.sort.map { |branch| link_to(branch, project_tree_path(project, branch)) }.join(", ").html_safe
|
branches.sort.map do |branch|
|
||||||
|
link_to(project_tree_path(project, branch)) do
|
||||||
|
content_tag :span, class: 'label label-gray' do
|
||||||
|
content_tag(:i, nil, class: 'fa fa-code-fork') + ' ' +
|
||||||
|
branch
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end.join(" ").html_safe
|
||||||
end
|
end
|
||||||
|
|
||||||
# Returns the sorted links to tags, separated by a comma
|
# Returns the sorted links to tags, separated by a comma
|
||||||
def commit_tags_links(project, tags)
|
def commit_tags_links(project, tags)
|
||||||
sorted = VersionSorter.rsort(tags)
|
sorted = VersionSorter.rsort(tags)
|
||||||
sorted.map { |tag| link_to(tag, project_commits_path(project, project.repository.find_tag(tag).name)) }.join(", ").html_safe
|
sorted.map do |tag|
|
||||||
|
link_to(project_commits_path(project, project.repository.find_tag(tag).name)) do
|
||||||
|
content_tag :span, class: 'label label-gray' do
|
||||||
|
content_tag(:i, nil, class: 'fa fa-tag') + ' ' +
|
||||||
|
tag
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end.join(" ").html_safe
|
||||||
end
|
end
|
||||||
|
|
||||||
def link_to_browse_code(project, commit)
|
def link_to_browse_code(project, commit)
|
||||||
|
|
|
@ -37,25 +37,23 @@
|
||||||
- @commit.parents.each do |parent|
|
- @commit.parents.each do |parent|
|
||||||
= link_to parent.short_id, project_commit_path(@project, parent)
|
= link_to parent.short_id, project_commit_path(@project, parent)
|
||||||
|
|
||||||
- if @branches.any?
|
.commit-info-row
|
||||||
.commit-info-row
|
- if @branches.any?
|
||||||
%span.cgray
|
|
||||||
Exists in
|
|
||||||
%span
|
%span
|
||||||
- branch = commit_default_branch(@project, @branches)
|
- branch = commit_default_branch(@project, @branches)
|
||||||
= link_to(branch, project_tree_path(@project, branch))
|
= link_to(project_tree_path(@project, branch)) do
|
||||||
- if @branches.any?
|
%span.label.label-gray
|
||||||
and in
|
%i.fa.fa-code-fork
|
||||||
= link_to("#{pluralize(@branches.count, "other branch")}", "#", class: "js-details-expand")
|
= branch
|
||||||
|
- if @branches.any? || @tags.any?
|
||||||
|
= link_to("#", class: "js-details-expand") do
|
||||||
|
%span.label.label-gray
|
||||||
|
\...
|
||||||
%span.js-details-content.hide
|
%span.js-details-content.hide
|
||||||
= commit_branches_links(@project, @branches)
|
- if @branches.any?
|
||||||
|
= commit_branches_links(@project, @branches)
|
||||||
- if @tags.any?
|
- if @tags.any?
|
||||||
.commit-info-row
|
= commit_tags_links(@project, @tags)
|
||||||
%span.cgray
|
|
||||||
Tags:
|
|
||||||
%span
|
|
||||||
= commit_tags_links(@project, @tags)
|
|
||||||
|
|
||||||
.commit-box
|
.commit-box
|
||||||
%h3.commit-title
|
%h3.commit-title
|
||||||
|
|
Loading…
Reference in New Issue