diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-14 18:15:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-14 18:15:22 +0300 |
| commit | cdb41961fd2bc233d36c5b30f89d087c2efa9818 (patch) | |
| tree | 9903f8054fc1f8681c670984a680b768d139a251 /app/assets/javascripts/branches | |
| parent | 8a5138ed7d38ccff8b5ca2fe0f7bbb77f8fdaad3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/branches')
| -rw-r--r-- | app/assets/javascripts/branches/components/delete_branch_modal.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/branches/components/delete_merged_branches.vue | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/javascripts/branches/components/delete_branch_modal.vue b/app/assets/javascripts/branches/components/delete_branch_modal.vue index df082488b39..d5631337cec 100644 --- a/app/assets/javascripts/branches/components/delete_branch_modal.vue +++ b/app/assets/javascripts/branches/components/delete_branch_modal.vue @@ -173,9 +173,7 @@ export default { </form> <template #modal-footer> - <div - class="gl-display-flex gl-flex-direction-row gl-justify-content-end gl-flex-wrap-wrap gl-m-0" - > + <div class="gl-display-flex gl-flex-direction-row gl-justify-content-end gl-flex-wrap gl-m-0"> <gl-button data-testid="delete-branch-cancel-button" @click="closeModal"> {{ $options.i18n.cancelButtonText }} </gl-button> diff --git a/app/assets/javascripts/branches/components/delete_merged_branches.vue b/app/assets/javascripts/branches/components/delete_merged_branches.vue index 3393fb5c014..70974f2e725 100644 --- a/app/assets/javascripts/branches/components/delete_merged_branches.vue +++ b/app/assets/javascripts/branches/components/delete_merged_branches.vue @@ -150,7 +150,7 @@ export default { <template #modal-footer> <div - class="gl-display-flex gl-flex-direction-row gl-justify-content-end gl-flex-wrap-wrap gl-m-0 gl-mr-3" + class="gl-display-flex gl-flex-direction-row gl-justify-content-end gl-flex-wrap gl-m-0 gl-mr-3" > <gl-button data-testid="delete-merged-branches-cancel-button" @click="closeModal"> {{ $options.i18n.cancelButtonText }} |