diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-09 12:05:46 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-09 12:05:46 -0500 |
| commit | 66d3894d53995b01e5a6c0686ca9b787a7bec1c7 (patch) | |
| tree | 85e6b91577e3b2f6494719db05909cdbf1f3ad75 | |
| parent | aa4942a2132652ccca52a583c78f7aa92ff7d256 (diff) | |
| download | gitlab-ce-66d3894d53995b01e5a6c0686ca9b787a7bec1c7.tar.gz | |
Fix bad merge conflict
| -rw-r--r-- | app/helpers/issuables_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/commits/_commit.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 06c3e569c84..1ece87fbe57 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -169,7 +169,7 @@ module IssuablesHelper if display_count 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 html.html_safe diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index 163432c9263..1e6c1cac51c 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -59,5 +59,5 @@ .commit-sha-group .label.label-monospace = 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) |