diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-25 07:58:23 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-25 07:58:23 +0000 |
| commit | 7eaafea288cc43f7e314e44c6e46c87661cfd21d (patch) | |
| tree | 7967db780f68158b160ea45322cd76bf76eb4354 /app/assets/javascripts/vue_merge_request_widget | |
| parent | b9ed721bc23ef2debe321393c2bc161a60912e5e (diff) | |
| parent | ace3bf9adad6d5752bfebafb6606bfa57b3818e4 (diff) | |
| download | gitlab-ce-7eaafea288cc43f7e314e44c6e46c87661cfd21d.tar.gz | |
Merge branch 'backport-qa_78' into 'master'
QA BACKPORT - Test merge request rebase
See merge request gitlab-org/gitlab-ce!17186
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js index 7ba6c29006a..162f048aac7 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js @@ -227,7 +227,8 @@ export default { @click="handleMergeButtonClick()" :disabled="isMergeButtonDisabled" :class="mergeButtonClass" - type="button"> + type="button" + class="qa-merge-button"> <i v-if="isMakingRequest" class="fa fa-spinner fa-spin" 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 e9f23b0b113..143fd328d88 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 @@ -111,7 +111,7 @@ js-toggle-container accept-action media space-children" > <button type="button" - class="btn btn-sm btn-reopen btn-success" + class="btn btn-sm btn-reopen btn-success qa-mr-rebase-button" :disabled="isMakingRequest" @click="rebase" > |