diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-24 12:06:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-24 12:06:18 +0300 |
| commit | dc0622dbe3cd552abca4107557c6c09edb23625c (patch) | |
| tree | 224dc625a2fe70a37ea7af11b1ad539b9bee2212 /app/views | |
| parent | 12287a65b735d784cda3555d1b261e50b461b29e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/protected_branches/shared/_branches_list.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/protected_branches/shared/_branches_list.html.haml b/app/views/projects/protected_branches/shared/_branches_list.html.haml index 9dff251101b..f07de81d7fd 100644 --- a/app/views/projects/protected_branches/shared/_branches_list.html.haml +++ b/app/views/projects/protected_branches/shared/_branches_list.html.haml @@ -5,6 +5,7 @@ %p.settings-message.text-center = s_("ProtectedBranch|There are currently no protected branches, protect a branch with the form above.") - else + .flash-container %table.table.table-bordered %colgroup %col{ width: "20%" } @@ -27,8 +28,6 @@ - if can_admin_project %th %tbody - %tr - %td.flash-container{ colspan: 5 } = yield = paginate @protected_branches, theme: 'gitlab' |