kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix bad merge conflict

Browse source
This commit is contained in:
Clement Ho 2018-04-09 12:05:46 -05:00
parent aa4942a213
commit 66d3894d53
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/issuables_helper.rb
View file

@ -169,7 +169,7 @@ module IssuablesHelper
if display_count if display_count
count = issuables_count_for_state(issuable_type, state) count = issuables_count_for_state(issuable_type, state)
html << " " << content_tag(:span, number_with_delimiter(count), class: 'badge') html << " " << content_tag(:span, number_with_delimiter(count), class: 'badge badge-pill')
end end
html.html_safe html.html_safe

2
app/views/projects/commits/_commit.html.haml
View file

@ -59,5 +59,5 @@
.commit-sha-group .commit-sha-group
.label.label-monospace .label.label-monospace
= commit.short_id = commit.short_id
= clipboard_button(text: commit.id, title: _("Copy commit SHA to clipboard"), class: "btn btn-default", container: "body") = clipboard_button(text: commit.id, title: _("Copy commit SHA to clipboard"), class: "btn btn-secondary", container: "body")
= link_to_browse_code(project, commit) = link_to_browse_code(project, commit)