kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'robmv/gitlab-ce-issue21305'

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2016-09-30 17:06:00 +03:00
commit 15afe27122
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG
View file

@ -33,6 +33,9 @@ v 8.12.3
- Update Gitlab Shell to support low IO priority for storage moves - Update Gitlab Shell to support low IO priority for storage moves
v 8.12.2 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 Import/Export not recognising correctly the imported services.
- Fix snippets pagination - Fix snippets pagination
- Fix List-Unsubscribe header in emails - Fix List-Unsubscribe header in emails

2
app/views/shared/_visibility_level.html.haml
View file

@ -6,7 +6,7 @@
- if can_change_visibility_level - if can_change_visibility_level
= render('shared/visibility_radios', model_method: :visibility_level, form: f, selected_level: visibility_level, form_model: form_model) = render('shared/visibility_radios', model_method: :visibility_level, form: f, selected_level: visibility_level, form_model: form_model)
- else - else
.col-sm-10 %div
%span.info %span.info
= visibility_level_icon(visibility_level) = visibility_level_icon(visibility_level)
%strong %strong

2
app/views/shared/_visibility_radios.html.haml
View file

@ -10,6 +10,6 @@
.option-descr .option-descr
= visibility_level_description(level, form_model) = visibility_level_description(level, form_model)
- unless restricted_visibility_levels.empty? - unless restricted_visibility_levels.empty?
.col-sm-10 %div
%span.info %span.info
Some visibility level settings have been restricted by the administrator. Some visibility level settings have been restricted by the administrator.