diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-11-26 13:55:47 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-11-29 14:49:30 +0000 |
| commit | ddf288f0d0d6bed07303b8e34288c41114f3a5ab (patch) | |
| tree | b9170004b0264400bfd2c7f20b6386621ab87558 | |
| parent | fc0350118385df28e435488cbf4be35e5cfbe70b (diff) | |
| download | gitlab-ce-24135-new-project-should-be-below-new-group-on-the-welcome-screen.tar.gz | |
Moved groups above projects24135-new-project-should-be-below-new-group-on-the-welcome-screen
| -rw-r--r-- | app/views/dashboard/projects/_zero_authorized_projects.html.haml | 23 | ||||
| -rw-r--r-- | changelogs/unreleased/24135-new-project-should-be-below-new-group-on-the-welcome-screen.yml | 4 |
2 files changed, 16 insertions, 11 deletions
diff --git a/app/views/dashboard/projects/_zero_authorized_projects.html.haml b/app/views/dashboard/projects/_zero_authorized_projects.html.haml index fdea834ff45..4a55aac0df6 100644 --- a/app/views/dashboard/projects/_zero_authorized_projects.html.haml +++ b/app/views/dashboard/projects/_zero_authorized_projects.html.haml @@ -4,6 +4,18 @@ Welcome to GitLab %p.blank-state-text Code, test, and deploy together + +- if current_user.can_create_group? + .blank-state + .blank-state-icon + = custom_icon("group", size: 50) + %h3.blank-state-title + You can create a group for several dependent projects. + %p.blank-state-text + Groups are the best way to manage projects and members. + = link_to new_group_path, class: "btn btn-new" do + New group + .blank-state .blank-state-icon = custom_icon("project", size: 50) @@ -21,17 +33,6 @@ = link_to new_project_path, class: "btn btn-new" do New project -- if current_user.can_create_group? - .blank-state - .blank-state-icon - = custom_icon("group", size: 50) - %h3.blank-state-title - You can create a group for several dependent projects. - %p.blank-state-text - Groups are the best way to manage projects and members. - = link_to new_group_path, class: "btn btn-new" do - New group - -if publicish_project_count > 0 .blank-state .blank-state-icon diff --git a/changelogs/unreleased/24135-new-project-should-be-below-new-group-on-the-welcome-screen.yml b/changelogs/unreleased/24135-new-project-should-be-below-new-group-on-the-welcome-screen.yml new file mode 100644 index 00000000000..855e4e1ba1d --- /dev/null +++ b/changelogs/unreleased/24135-new-project-should-be-below-new-group-on-the-welcome-screen.yml @@ -0,0 +1,4 @@ +--- +title: Moved new projects button below new group button on the welcome screen +merge_request: 7770 +author: |