BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit b3a29b31 by Timothy Andrew
Options

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
parent 8e25ddc5
Showing with 8 additions and 8 deletions
app/views/projects/protected_branches/_branches_list.html.haml
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
%tr %tr
%th Branch %th Branch
%th Last commit %th Last commit
%th Allowed to Merge %th Allowed to merge
%th Allowed to Push %th Allowed to push
- if can_admin_project - if can_admin_project
%th %th
%tbody %tbody
......
app/views/projects/protected_branches/_protected_branch.html.haml
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
%td %td
= hidden_field_tag "allowed_to_merge_#{protected_branch.id}", protected_branch.merge_access_level.access_level = hidden_field_tag "allowed_to_merge_#{protected_branch.id}", protected_branch.merge_access_level.access_level
= dropdown_tag(protected_branch.merge_access_level.humanize, = 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" }}) data: { field_name: "allowed_to_merge_#{protected_branch.id}", url: url, id: protected_branch.id, type: "allowed_to_merge" }})
%td %td
= hidden_field_tag "allowed_to_push_#{protected_branch.id}", protected_branch.push_access_level.access_level = hidden_field_tag "allowed_to_push_#{protected_branch.id}", protected_branch.push_access_level.access_level
= dropdown_tag(protected_branch.push_access_level.humanize, = 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" }}) data: { field_name: "allowed_to_push_#{protected_branch.id}", url: url, id: protected_branch.id, type: "allowed_to_push" }})
- if can_admin_project - if can_admin_project
%td %td
......
app/views/projects/protected_branches/index.html.haml
...@@ -34,18 +34,18 @@ ...@@ -34,18 +34,18 @@
.form-group .form-group
.prepend-left-10 .prepend-left-10
= f.hidden_field :allowed_to_merge = 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>", = 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', dropdown_class: 'dropdown-menu-selectable',
data: { field_name: "protected_branch[allowed_to_merge]" }}) data: { field_name: "protected_branch[allowed_to_merge]" }})
.form-group .form-group
.prepend-left-10 .prepend-left-10
= f.hidden_field :allowed_to_push = 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>", = 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', dropdown_class: 'dropdown-menu-selectable',
data: { field_name: "protected_branch[allowed_to_push]" }}) data: { field_name: "protected_branch[allowed_to_push]" }})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment