summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-12-06 12:49:34 +0000
committerPhil Hughes <me@iamphill.com>2017-12-06 12:49:34 +0000
commit4783f15a2dc1d6f42532e59ed68b5c7d9a7426f8 (patch)
tree05eba0e3f5538b772a43f73bde3a69cb20d6be1b
parent6836078304f8eb889c1d3324c4bcf04a1168afcd (diff)
downloadgitlab-ce-admin-welcome-new-group-link.tar.gz
Fixes admin welcome states new group pathadmin-welcome-new-group-link
Closes #40645
-rw-r--r--app/views/dashboard/projects/_blank_state_admin_welcome.html.haml2
-rw-r--r--changelogs/unreleased/admin-welcome-new-group-link.yml5
-rw-r--r--spec/views/dashboard/projects/_blank_state_admin_welcome.haml.rb15
3 files changed, 21 insertions, 1 deletions
diff --git a/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml b/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
index 573a4b93d67..c50b20a83dc 100644
--- a/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
+++ b/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
@@ -10,7 +10,7 @@
Projects are where you store your code, access issues, wiki and other features of GitLab.
- if current_user.can_create_group?
- = link_to admin_root_path, class: "blank-state-link" do
+ = link_to new_group_path, class: "blank-state-link" do
.blank-state
.blank-state-icon
= custom_icon("add_new_group", size: 50)
diff --git a/changelogs/unreleased/admin-welcome-new-group-link.yml b/changelogs/unreleased/admin-welcome-new-group-link.yml
new file mode 100644
index 00000000000..9c939a0a3ad
--- /dev/null
+++ b/changelogs/unreleased/admin-welcome-new-group-link.yml
@@ -0,0 +1,5 @@
+---
+title: Fixed admin welcome screen new group path
+merge_request:
+author:
+type: fixed
diff --git a/spec/views/dashboard/projects/_blank_state_admin_welcome.haml.rb b/spec/views/dashboard/projects/_blank_state_admin_welcome.haml.rb
new file mode 100644
index 00000000000..2f58eec86dc
--- /dev/null
+++ b/spec/views/dashboard/projects/_blank_state_admin_welcome.haml.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe 'dashboard/projects/_blank_state_admin_welcome.html.haml' do
+ let(:user) { create(:admin) }
+
+ before do
+ allow(view).to receive(:current_user).and_return(user)
+ end
+
+ it 'links to new group path' do
+ render
+
+ expect(rendered).to have_link('Create a group', href: new_group_path)
+ end
+end