diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-05-25 21:05:53 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-05-25 21:05:53 +0000 |
| commit | 74894a38779adb32a8b8a3cdad8358fc98693403 (patch) | |
| tree | 4bf957d7b513797b03e571f451a760e2eb1524d8 /app/views/shared/_new_commit_form.html.haml | |
| parent | 6f4935bcee76a7af532399945f440a8fbd15658e (diff) | |
| parent | d219ed25fa0b67984984f0b5f60f1eff7a0c34c9 (diff) | |
| download | gitlab-ce-74894a38779adb32a8b8a3cdad8358fc98693403.tar.gz | |
Merge branch 'bootstrap4' into 'master'
Upgrade to Bootstrap 4
Closes #45185 and #46710
See merge request gitlab-org/gitlab-ce!18232
Diffstat (limited to 'app/views/shared/_new_commit_form.html.haml')
| -rw-r--r-- | app/views/shared/_new_commit_form.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/_new_commit_form.html.haml b/app/views/shared/_new_commit_form.html.haml index 9221fd1e025..81c33eeea4f 100644 --- a/app/views/shared/_new_commit_form.html.haml +++ b/app/views/shared/_new_commit_form.html.haml @@ -7,8 +7,8 @@ = hidden_field_tag 'branch_name', @ref - else - if can?(current_user, :push_code, @project) - .form-group.branch - = label_tag 'branch_name', _('Target Branch'), class: 'control-label' + .form-group.row.branch + = label_tag 'branch_name', _('Target Branch'), class: 'col-form-label col-sm-2' .col-sm-10 = text_field_tag 'branch_name', branch_name, required: true, class: "form-control js-branch-name ref-name" |