diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-29 18:27:58 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-29 18:27:58 +0000 |
| commit | ef6a91af123d8b773ba8a286cf986abaedee6c33 (patch) | |
| tree | 1dd10f08fd8f9c631883a548bc76c25bda5262fe | |
| parent | f5b712e7b7d1504485155aa2bfb1983482b19bba (diff) | |
| parent | ddf288f0d0d6bed07303b8e34288c41114f3a5ab (diff) | |
| download | gitlab-ce-24834-timeago-not-working-properly-on-dynamically-loading-diff-discussions.tar.gz | |
Merge branch '24135-new-project-should-be-below-new-group-on-the-welcome-screen' into 'master'
24834-timeago-not-working-properly-on-dynamically-loading-diff-discussions
New project should be below new group on the welcome screen
## What does this MR do?
Places the group `.blank-slate` above the project's.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24135
See merge request !7770
| -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: |