diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-26 14:26:31 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-26 14:26:31 +0000 |
| commit | a9aa97b7271bec66ab4fd86dbf5586fd35fc0049 (patch) | |
| tree | afe16e510cac3f4424f1711f8e1b07575c8129b2 | |
| parent | b227b9add0f5845848c0a607d5c8c2aae767c7b8 (diff) | |
| parent | c10296f92d581f54cbd32c156806ad72eddcab77 (diff) | |
| download | gitlab-ce-a9aa97b7271bec66ab4fd86dbf5586fd35fc0049.tar.gz | |
Merge branch 'visibility-level-text-admin-area' into 'master'
Fix visibility level texts on application settings
Introduced by me through !2005
Before:
After:
See merge request !2611
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 2a4b32f2519..858c5dd96a2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,6 +9,7 @@ v 8.5.0 (unreleased) - Whitelist raw "abbr" elements when parsing Markdown (Benedict Etzel) - Don't vendor minified JS - Track project import failure + - Fix visibility level text in admin area (Zeger-Jan van de Weg) v 8.4.1 - Apply security updates for Rails (4.2.5.1), rails-html-sanitizer (1.0.3), diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index dde35f8742a..baadca09518 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -14,11 +14,11 @@ .form-group.project-visibility-level-holder = f.label :default_project_visibility, class: 'control-label col-sm-2' .col-sm-10 - = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: Project) + = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: Project.new) .form-group.project-visibility-level-holder = f.label :default_snippet_visibility, class: 'control-label col-sm-2' .col-sm-10 - = render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: PersonalSnippet) + = render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: ProjectSnippet.new) .form-group = f.label :restricted_visibility_levels, class: 'control-label col-sm-2' .col-sm-10 |