diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-10 22:27:06 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-10 22:27:06 +0200 |
commit | 95a10f4533fdb708c61ffda95099bddd94800f02 (patch) | |
tree | bf5c561472c47d34e5ff1f643c49cd2a6b206f15 /app/views/layouts/nav/_group.html.haml | |
parent | 17c6bec79d876ce932edc0edc5d17622adb2f724 (diff) | |
parent | b4e84809e8170a43126507da0bc6a3b94c33804b (diff) | |
download | gitlab-ce-95a10f4533fdb708c61ffda95099bddd94800f02.tar.gz |
Merge remote-tracking branch 'origin/master' into ci-lfs-fetch
Diffstat (limited to 'app/views/layouts/nav/_group.html.haml')
-rw-r--r-- | app/views/layouts/nav/_group.html.haml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml index de15add3617..9cbee0aa363 100644 --- a/app/views/layouts/nav/_group.html.haml +++ b/app/views/layouts/nav/_group.html.haml @@ -5,36 +5,36 @@ .fade-left = nav_link(path: 'groups#show', html_options: {class: 'home'}) do = link_to group_path(@group), title: 'Home' do - = icon('group fw') + = navbar_icon('group') %span Group = nav_link(path: 'groups#activity') do = link_to activity_group_path(@group), title: 'Activity' do - = icon('dashboard fw') + = navbar_icon('activity') %span Activity = nav_link(controller: [:group, :milestones]) do = link_to group_milestones_path(@group), title: 'Milestones' do - = icon('clock-o fw') + = navbar_icon('milestones') %span Milestones = nav_link(path: 'groups#issues') do = link_to issues_group_path(@group), title: 'Issues' do - = icon('exclamation-circle fw') + = navbar_icon('issues') %span Issues - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute %span.badge.count= number_with_delimiter(issues.count) = nav_link(path: 'groups#merge_requests') do = link_to merge_requests_group_path(@group), title: 'Merge Requests' do - = icon('tasks fw') + = navbar_icon('mr') %span Merge Requests - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute %span.badge.count= number_with_delimiter(merge_requests.count) = nav_link(controller: [:group_members]) do = link_to group_group_members_path(@group), title: 'Members' do - = icon('users fw') + = navbar_icon('members') %span Members .fade-right |