Favor labels like `Allowed to push` over `Allowed To Push`.
- Based on feedback from @axil - http://docs.gitlab.com/ce/development/ui_guide.html#buttons
This commit is contained in:
parent
8e25ddc529
commit
b3a29b3180
|
@ -16,8 +16,8 @@
|
|||
%tr
|
||||
%th Branch
|
||||
%th Last commit
|
||||
%th Allowed to Merge
|
||||
%th Allowed to Push
|
||||
%th Allowed to merge
|
||||
%th Allowed to push
|
||||
- if can_admin_project
|
||||
%th
|
||||
%tbody
|
||||
|
|
|
@ -17,12 +17,12 @@
|
|||
%td
|
||||
= hidden_field_tag "allowed_to_merge_#{protected_branch.id}", protected_branch.merge_access_level.access_level
|
||||
= dropdown_tag(protected_branch.merge_access_level.humanize,
|
||||
options: { title: "Allowed To Merge", toggle_class: 'allowed-to-merge', dropdown_class: 'dropdown-menu-selectable merge',
|
||||
options: { title: "Allowed to merge", toggle_class: 'allowed-to-merge', dropdown_class: 'dropdown-menu-selectable merge',
|
||||
data: { field_name: "allowed_to_merge_#{protected_branch.id}", url: url, id: protected_branch.id, type: "allowed_to_merge" }})
|
||||
%td
|
||||
= hidden_field_tag "allowed_to_push_#{protected_branch.id}", protected_branch.push_access_level.access_level
|
||||
= dropdown_tag(protected_branch.push_access_level.humanize,
|
||||
options: { title: "Allowed To Push", toggle_class: 'allowed-to-push', dropdown_class: 'dropdown-menu-selectable push',
|
||||
options: { title: "Allowed to push", toggle_class: 'allowed-to-push', dropdown_class: 'dropdown-menu-selectable push',
|
||||
data: { field_name: "allowed_to_push_#{protected_branch.id}", url: url, id: protected_branch.id, type: "allowed_to_push" }})
|
||||
- if can_admin_project
|
||||
%td
|
||||
|
|
|
@ -34,18 +34,18 @@
|
|||
.form-group
|
||||
.prepend-left-10
|
||||
= f.hidden_field :allowed_to_merge
|
||||
= f.label :allowed_to_merge, "Allowed to Merge: ", class: "label-light append-bottom-0"
|
||||
= f.label :allowed_to_merge, "Allowed to merge: ", class: "label-light append-bottom-0"
|
||||
= dropdown_tag("<Make a selection>",
|
||||
options: { title: "Allowed To Merge", toggle_class: 'allowed-to-merge',
|
||||
options: { title: "Allowed to merge", toggle_class: 'allowed-to-merge',
|
||||
dropdown_class: 'dropdown-menu-selectable',
|
||||
data: { field_name: "protected_branch[allowed_to_merge]" }})
|
||||
|
||||
.form-group
|
||||
.prepend-left-10
|
||||
= f.hidden_field :allowed_to_push
|
||||
= f.label :allowed_to_push, "Allowed to Push: ", class: "label-light append-bottom-0"
|
||||
= f.label :allowed_to_push, "Allowed to push: ", class: "label-light append-bottom-0"
|
||||
= dropdown_tag("<Make a selection>",
|
||||
options: { title: "Allowed To Push", toggle_class: 'allowed-to-push',
|
||||
options: { title: "Allowed to push", toggle_class: 'allowed-to-push',
|
||||
dropdown_class: 'dropdown-menu-selectable',
|
||||
data: { field_name: "protected_branch[allowed_to_push]" }})
|
||||
|
||||
|
|
Loading…
Reference in New Issue