diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-31 18:26:05 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-31 18:26:05 +0000 |
| commit | 321610424df3e143f8a55a512cfd297f1ab8ca81 (patch) | |
| tree | 9e4f9fb5126e6d1c4841ea54a84cd4ea300e81ef | |
| parent | 3fb5c163a75873107bbd2edc6e7f10d355ec20aa (diff) | |
| parent | a3c926af0df52317124fe53f7100363ed99b4aab (diff) | |
| download | gitlab-ce-321610424df3e143f8a55a512cfd297f1ab8ca81.tar.gz | |
Merge branch '30276-move-top-badges' into 'master'
30276 Move issue, mr, todos next to profile dropdown in top nav
Closes #30276
See merge request !10347
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 18 | ||||
| -rw-r--r-- | changelogs/unreleased/30276-move-top-badges.yml | 4 |
2 files changed, 13 insertions, 9 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 43abd44d89f..23abf6897d4 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -35,6 +35,15 @@ %li = link_to admin_root_path, title: 'Admin Area', aria: { label: "Admin Area" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = icon('wrench fw') + - if current_user.can_create_project? + %li + = link_to new_project_path, title: 'New project', aria: { label: "New project" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do + = icon('plus fw') + - if Gitlab::Sherlock.enabled? + %li + = link_to sherlock_transactions_path, title: 'Sherlock Transactions', + data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do + = icon('tachometer fw') %li = link_to assigned_issues_dashboard_path, title: 'Issues', aria: { label: "Issues" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = icon('hashtag fw') @@ -50,15 +59,6 @@ = icon('check-circle fw') %span.badge.todos-count = todos_count_format(todos_pending_count) - - if current_user.can_create_project? - %li - = link_to new_project_path, title: 'New project', aria: { label: "New project" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do - = icon('plus fw') - - if Gitlab::Sherlock.enabled? - %li - = link_to sherlock_transactions_path, title: 'Sherlock Transactions', - data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do - = icon('tachometer fw') %li.header-user.dropdown = link_to current_user, class: "header-user-dropdown-toggle", data: { toggle: "dropdown" } do = image_tag avatar_icon(current_user, 26), width: 26, height: 26, class: "header-user-avatar" diff --git a/changelogs/unreleased/30276-move-top-badges.yml b/changelogs/unreleased/30276-move-top-badges.yml new file mode 100644 index 00000000000..68a8ab359fd --- /dev/null +++ b/changelogs/unreleased/30276-move-top-badges.yml @@ -0,0 +1,4 @@ +--- +title: Move issue, mr, todos next to profile dropdown in top nav +merge_request: +author: |