diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-18 17:58:22 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-18 17:58:22 +0300 |
| commit | f5f0ed55bd7bf7d034282c5b3e7f02ca725a4ffa (patch) | |
| tree | a71f62ba4b8af746a38f135de8383e2a9c403b06 /app/views | |
| parent | 307a6ba57f20f7a0ac02bbf9f7a50edff04cf6e5 (diff) | |
| parent | f93190429743f66d2a085891d51d004b390b4491 (diff) | |
| download | gitlab-ce-f5f0ed55bd7bf7d034282c5b3e7f02ca725a4ffa.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/shared/_visibility_radios.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/snippets/_form.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/_visibility_radios.html.haml b/app/views/shared/_visibility_radios.html.haml index b07c4d20f12..02416125a72 100644 --- a/app/views/shared/_visibility_radios.html.haml +++ b/app/views/shared/_visibility_radios.html.haml @@ -1,7 +1,7 @@ - Gitlab::VisibilityLevel.values.each do |level| .radio - restricted = restricted_visibility_levels.include?(level) - = label model_method, level do + = form.label "#{model_method}_#{level}" do = form.radio_button model_method, level, checked: (selected_level == level), disabled: restricted = visibility_level_icon(level) .option-title diff --git a/app/views/shared/snippets/_form.html.haml b/app/views/shared/snippets/_form.html.haml index 6783587bda9..9610f9ce414 100644 --- a/app/views/shared/snippets/_form.html.haml +++ b/app/views/shared/snippets/_form.html.haml @@ -11,7 +11,7 @@ .col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'form-control', required: true = render 'shared/visibility_level', f: f, visibility_level: visibility_level, can_change_visibility_level: true, form_model: @snippet - + .form-group .file-editor = f.label :file_name, "File", class: 'control-label' |