diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-11-22 02:34:24 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-11-22 02:34:24 +0000 |
| commit | 2579cd7590e4da2fda5926e9ff2f923bc0c76452 (patch) | |
| tree | 349f9278fcf051b58241e163751857e5a20a40c9 /app/views | |
| parent | a7616e03c5774d1e1899e0cc60be18b5bf339cca (diff) | |
| parent | cf94db702e486562cda04e3eaf6b5e915e4e7f36 (diff) | |
| download | gitlab-ce-2579cd7590e4da2fda5926e9ff2f923bc0c76452.tar.gz | |
Merge branch '18136-ui-for-restricting-global-visibility-levels-is-unclear' into 'master'
Restricted visibility buttons to checkboxes
## What does this MR do?
Changes the `Restricted visibility levels` settings to use checkboxes instead of a button group.
## 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 #18136
See merge request !7463
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index a236335131a..95cae5ea24b 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -22,9 +22,8 @@ .form-group = f.label :restricted_visibility_levels, class: 'control-label col-sm-2' .col-sm-10 - - data_attrs = { toggle: 'buttons' } - .btn-group{ data: data_attrs } - - restricted_level_checkboxes('restricted-visibility-help').each do |level| + - restricted_level_checkboxes('restricted-visibility-help').each do |level| + .checkbox = level %span.help-block#restricted-visibility-help Selected levels cannot be used by non-admin users for projects or snippets. |