diff options
| author | Regis <boudinot.regis@yahoo.com> | 2016-12-23 16:34:56 -0700 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2016-12-23 16:34:56 -0700 |
| commit | 71d731a21b96cdd9d1881a8e03961f7008cb8d64 (patch) | |
| tree | f31b57dde85b65345733b4bcd3915bab37236e47 /app/views/layouts/nav/_admin.html.haml | |
| parent | 115536fbfa9904cef459bb735d29f20756887ebe (diff) | |
| parent | 21fb690c216f9e40be07229726e106d7016e13fc (diff) | |
| download | gitlab-ce-71d731a21b96cdd9d1881a8e03961f7008cb8d64.tar.gz | |
merge master and fix application.rb conflict
Diffstat (limited to 'app/views/layouts/nav/_admin.html.haml')
| -rw-r--r-- | app/views/layouts/nav/_admin.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml index ac04f57e217..b69114c96cc 100644 --- a/app/views/layouts/nav/_admin.html.haml +++ b/app/views/layouts/nav/_admin.html.haml @@ -31,7 +31,7 @@ = link_to admin_abuse_reports_path, title: "Abuse Reports" do %span Abuse Reports - %span.badge.count= number_with_delimiter(AbuseReport.count(:all)) + %span.badge.badge-dark.count= number_with_delimiter(AbuseReport.count(:all)) - if askimet_enabled? = nav_link(controller: :spam_logs) do |