Merge branch 'admin-welcome-new-group-link' into 'master'

Fixes admin welcome states new group path

Closes #40645

See merge request gitlab-org/gitlab-ce!15761
This commit is contained in:
Filipa Lacerda 2017-12-06 16:55:37 +00:00
commit bf934a8f7c
3 changed files with 21 additions and 1 deletions

View File

@ -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)

View File

@ -0,0 +1,5 @@
---
title: Fixed admin welcome screen new group path
merge_request:
author:
type: fixed

View File

@ -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