diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-11-10 18:28:34 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-10 18:28:34 +0000 |
| commit | bb9586706419652dd52918e492d35710df4f7e69 (patch) | |
| tree | 742912cd9b0b74bb88a39a99568dd91ec8cfe785 | |
| parent | d366a943ffe2ae6c3599c2ebc4469d49a103bacb (diff) | |
| parent | 957226d81c072dbd622cb11276d42210339e0282 (diff) | |
| download | gitlab-ce-bb9586706419652dd52918e492d35710df4f7e69.tar.gz | |
Merge branch '24048-dropdown-issue-with-devider' into 'master'
Resolves divider issue in group setting dropdown
## What does this MR do?
This MR resolves the issue #24048
## Are there points in the code the reviewer needs to double check?
NR
## Why was this MR needed?
This MR removes extra divider from group setting dropdown when there is only one entry to show. This improves UX
## Screenshots (if relevant)
**Before**
**After**
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [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)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24048
See merge request !7398
| -rw-r--r-- | app/views/layouts/nav/_group_settings.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/24048-dropdown-issue-with-devider.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/layouts/nav/_group_settings.html.haml b/app/views/layouts/nav/_group_settings.html.haml index 75275afc0f3..c0328fe8842 100644 --- a/app/views/layouts/nav/_group_settings.html.haml +++ b/app/views/layouts/nav/_group_settings.html.haml @@ -14,7 +14,7 @@ - if can_admin_group = nav_link(path: 'groups#projects') do = link_to 'Projects', projects_group_path(@group), title: 'Projects' - - if can_edit || can_leave + - if (can_edit || can_leave) && can_admin_group %li.divider - if can_edit %li diff --git a/changelogs/unreleased/24048-dropdown-issue-with-devider.yml b/changelogs/unreleased/24048-dropdown-issue-with-devider.yml new file mode 100644 index 00000000000..b889da61957 --- /dev/null +++ b/changelogs/unreleased/24048-dropdown-issue-with-devider.yml @@ -0,0 +1,4 @@ +--- +title: "[Fix] Extra divider issue in dropdown" +merge_request: 7398 +author: |