diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-09-30 17:06:00 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-09-30 17:06:00 +0300 |
| commit | 15afe271224fd52f4eeda1c2e3be5529e5c94f15 (patch) | |
| tree | d6be0aa5340d055da089a567d59b07984f25584a | |
| parent | 9d48bace9b42eb8eac7d3d27a678da54364555a2 (diff) | |
| parent | 55be351f81b771209982e4bcffe93939b14dfe24 (diff) | |
| download | gitlab-ce-15afe271224fd52f4eeda1c2e3be5529e5c94f15.tar.gz | |
Merge branch 'robmv/gitlab-ce-issue21305'
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | app/views/shared/_visibility_level.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/_visibility_radios.html.haml | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 12fcec03514..2657462cac2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -33,6 +33,9 @@ v 8.12.3 - Update Gitlab Shell to support low IO priority for storage moves v 8.12.2 + - Fix "Create project" button layout when visibility options are restricted + +v 8.12.2 (unreleased) - Fix Import/Export not recognising correctly the imported services. - Fix snippets pagination - Fix List-Unsubscribe header in emails diff --git a/app/views/shared/_visibility_level.html.haml b/app/views/shared/_visibility_level.html.haml index add4536a0a2..b11257ee0e6 100644 --- a/app/views/shared/_visibility_level.html.haml +++ b/app/views/shared/_visibility_level.html.haml @@ -6,7 +6,7 @@ - if can_change_visibility_level = render('shared/visibility_radios', model_method: :visibility_level, form: f, selected_level: visibility_level, form_model: form_model) - else - .col-sm-10 + %div %span.info = visibility_level_icon(visibility_level) %strong diff --git a/app/views/shared/_visibility_radios.html.haml b/app/views/shared/_visibility_radios.html.haml index ebe2eb0433d..182c4eebd50 100644 --- a/app/views/shared/_visibility_radios.html.haml +++ b/app/views/shared/_visibility_radios.html.haml @@ -10,6 +10,6 @@ .option-descr = visibility_level_description(level, form_model) - unless restricted_visibility_levels.empty? - .col-sm-10 + %div %span.info Some visibility level settings have been restricted by the administrator. |