diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-15 21:09:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-15 21:09:50 +0300 |
| commit | b302502690b2e1422a4ef6abebdcf3ff4dc88543 (patch) | |
| tree | 0cd7ca6ff21b59c007277b5bae9611a7cedd8134 /app/assets/javascripts/vue_merge_request_widget | |
| parent | b616fd825faac3e7f194e1f942ef30730021e463 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue index 39a374d1193..59767eb2e6e 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue @@ -221,6 +221,17 @@ export default { > {{ __('Rebase') }} </gl-button> + <gl-button + v-if="glFeatures.restructuredMrWidget && showRebaseWithoutCi" + :loading="isMakingRequest" + variant="confirm" + size="small" + category="secondary" + data-testid="rebase-without-ci-button" + @click="rebaseWithoutCi" + > + {{ __('Rebase without pipeline') }} + </gl-button> </div> </div> </template> |