Commit bb958670 authored by Fatih Acet's avatar Fatih Acet

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**
![dd-before](/uploads/b4696b610a921a710c6be74fbb212260/dd-before.png)

**After**
![Screen_Shot_2016-11-10_at_4.09.36_PM](/uploads/a4ff6efe92ce60837afad079398c3880/Screen_Shot_2016-11-10_at_4.09.36_PM.png)

## 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
parents d366a943 957226d8
......@@ -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
......
---
title: "[Fix] Extra divider issue in dropdown"
merge_request: 7398
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment