diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 18:08:26 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 18:08:26 +0300 |
commit | c859c3bfd242288065fe5e2d887f7204f09e2335 (patch) | |
tree | 10febaf8774a3ea6ab3773c0dd97658d673fb280 /app/assets/javascripts/vue_merge_request_widget | |
parent | 28ce39a3e0e7b47e53939a15fb823af9c433327a (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_checking.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue index cf26003d038..a5e3115397a 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue @@ -12,7 +12,7 @@ export default { <div class="mr-widget-body media"> <status-icon :show-disabled-button="true" status="loading" /> <div class="media-body space-children"> - <span class="bold"> {{ s__('mrWidget|Checking ability to merge automatically') }} </span> + <span class="bold"> {{ s__('mrWidget|Checking ability to merge automatically…') }} </span> </div> </div> </template> diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js b/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js index 3ab229567f6..a298331c1fc 100644 --- a/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js +++ b/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js @@ -7,7 +7,7 @@ export default function deviseState(data) { return stateKey.missingBranch; } else if (!data.commits_count) { return stateKey.nothingToMerge; - } else if (this.mergeStatus === 'unchecked') { + } else if (this.mergeStatus === 'unchecked' || this.mergeStatus === 'checking') { return stateKey.checking; } else if (data.has_conflicts) { return stateKey.conflicts; |