diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-31 11:50:13 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-07-31 20:10:53 +0100 |
| commit | c8276c9b76f4e03fcf99c6eefaa67690d902d218 (patch) | |
| tree | 4f93455b698625b0fe8d86ab7c349d72555f06fb | |
| parent | 3b41e0b3291a57342b46f37f18e1fb529d1a6d8e (diff) | |
| download | gitlab-ce-c8276c9b76f4e03fcf99c6eefaa67690d902d218.tar.gz | |
Merge branch 'win-newnav-badges-firefox' into 'master'
Fix badge positioning in new navigation for Firefox
Closes #35634
See merge request !13186
| -rw-r--r-- | app/views/layouts/nav/_new_admin_sidebar.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/_new_group_sidebar.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/layouts/nav/_new_admin_sidebar.html.haml b/app/views/layouts/nav/_new_admin_sidebar.html.haml index 5cc636e89ef..f197b616bfa 100644 --- a/app/views/layouts/nav/_new_admin_sidebar.html.haml +++ b/app/views/layouts/nav/_new_admin_sidebar.html.haml @@ -87,8 +87,8 @@ = nav_link(controller: :abuse_reports) do = link_to admin_abuse_reports_path, title: "Abuse Reports" do %span - Abuse Reports %span.badge.count= number_with_delimiter(AbuseReport.count(:all)) + Abuse Reports - if akismet_enabled? = nav_link(controller: :spam_logs) do diff --git a/app/views/layouts/nav/_new_group_sidebar.html.haml b/app/views/layouts/nav/_new_group_sidebar.html.haml index c80308ed0de..a86956fce54 100644 --- a/app/views/layouts/nav/_new_group_sidebar.html.haml +++ b/app/views/layouts/nav/_new_group_sidebar.html.haml @@ -24,9 +24,9 @@ = nav_link(path: ['groups#issues', 'labels#index', 'milestones#index']) do = link_to issues_group_path(@group), title: 'Issues' do %span - Issues - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute %span.badge.count= number_with_delimiter(issues.count) + Issues %ul.sidebar-sub-level-items = nav_link(path: 'groups#issues', html_options: { class: 'home' }) do @@ -47,9 +47,9 @@ = nav_link(path: 'groups#merge_requests') do = link_to merge_requests_group_path(@group), title: 'Merge Requests' do %span - Merge Requests - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened', non_archived: true).execute %span.badge.count= number_with_delimiter(merge_requests.count) + Merge Requests = nav_link(path: 'group_members#index') do = link_to group_group_members_path(@group), title: 'Members' do %span |