diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-18 10:16:56 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-18 10:16:56 +0200 |
| commit | 2cf7f09b1e9ccb000433374a42bd7b33b73f8116 (patch) | |
| tree | 743e4ed2a6f2739541891749a6ef31bfd09e6805 /app/views/projects/protected_branches/_branches_list.html.haml | |
| parent | 1266e2664e7b080b440f5fc004424418284ee87b (diff) | |
| download | gitlab-ce-2cf7f09b1e9ccb000433374a42bd7b33b73f8116.tar.gz | |
Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'
""
This reverts commit 530f5158e297f3cde27f3566cfe13bad74ba3b50.
See !4892.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/views/projects/protected_branches/_branches_list.html.haml')
| -rw-r--r-- | app/views/projects/protected_branches/_branches_list.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/projects/protected_branches/_branches_list.html.haml b/app/views/projects/protected_branches/_branches_list.html.haml index 97cb1a9052b..720d67dff7c 100644 --- a/app/views/projects/protected_branches/_branches_list.html.haml +++ b/app/views/projects/protected_branches/_branches_list.html.haml @@ -8,6 +8,7 @@ .table-responsive %table.table.protected-branches-list %colgroup + %col{ width: "20%" } %col{ width: "30%" } %col{ width: "25%" } %col{ width: "25%" } @@ -18,6 +19,7 @@ %th Protected Branch %th Commit %th Developers Can Push + %th Developers Can Merge - if can_admin_project %th %tbody |