summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-02-28 14:21:31 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-02-28 14:21:31 +0000
commit8a52257d2e08f255608b783254fc8fd708f89e9e (patch)
treec671981ec44d546d02fb4fd187770d8da398bc74
parent4830a8b58cb415efc59a049ea696580f11e44728 (diff)
parent8f61290f22ba624a3a0ac9622c3ded1fa3140b90 (diff)
downloadgitlab-ce-8a52257d2e08f255608b783254fc8fd708f89e9e.tar.gz
Merge branch '27354-navigation-new-button' into 'master'
Put back the new project button Closes #27354 See merge request !9426
-rw-r--r--app/views/layouts/header/_default.html.haml4
-rw-r--r--changelogs/unreleased/27354-navigation-new-button.yml4
-rw-r--r--features/dashboard/dashboard.feature1
3 files changed, 9 insertions, 0 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 0b8388cbff3..66f5204a5c8 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -36,6 +36,10 @@
= icon('bell fw')
%span.badge.todos-pending-count{ class: ("hidden" if todos_pending_count == 0) }
= 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',
diff --git a/changelogs/unreleased/27354-navigation-new-button.yml b/changelogs/unreleased/27354-navigation-new-button.yml
new file mode 100644
index 00000000000..62cac9bbbd3
--- /dev/null
+++ b/changelogs/unreleased/27354-navigation-new-button.yml
@@ -0,0 +1,4 @@
+---
+title: Re-add the New Project button in nav bar
+merge_request:
+author:
diff --git a/features/dashboard/dashboard.feature b/features/dashboard/dashboard.feature
index 92061dac7f4..b1d5e4a7acb 100644
--- a/features/dashboard/dashboard.feature
+++ b/features/dashboard/dashboard.feature
@@ -11,6 +11,7 @@ Feature: Dashboard
And I visit dashboard page
Scenario: I should see projects list
+ Then I should see "New Project" link
Then I should see "Shop" project link
Then I should see "Shop" project CI status