From b3a29b3180c4edda33d82fc3564bd4991831e06c Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Tue, 19 Jul 2016 17:46:57 +0530
Subject: [PATCH] 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
---
.../projects/protected_branches/_branches_list.html.haml | 4 ++--
.../protected_branches/_protected_branch.html.haml | 4 ++--
app/views/projects/protected_branches/index.html.haml | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/app/views/projects/protected_branches/_branches_list.html.haml b/app/views/projects/protected_branches/_branches_list.html.haml
index 9240f1cf92d..a6956c8e69f 100644
--- a/app/views/projects/protected_branches/_branches_list.html.haml
+++ b/app/views/projects/protected_branches/_branches_list.html.haml
@@ -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
diff --git a/app/views/projects/protected_branches/_protected_branch.html.haml b/app/views/projects/protected_branches/_protected_branch.html.haml
index e27dea8145d..2fc6081e448 100644
--- a/app/views/projects/protected_branches/_protected_branch.html.haml
+++ b/app/views/projects/protected_branches/_protected_branch.html.haml
@@ -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
diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml
index cd87f978fb2..69caed7d979 100644
--- a/app/views/projects/protected_branches/index.html.haml
+++ b/app/views/projects/protected_branches/index.html.haml
@@ -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]" }})
--
GitLab