diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-10-19 13:03:41 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-10-27 04:52:30 -0400 |
| commit | b7835587e507ae9bc8e49c738370f6ef5b9f64fe (patch) | |
| tree | dd1b0abbb5584aa7a52c7b011da2a9bf100c290a /app/assets/javascripts/vue_merge_request_widget | |
| parent | a1aa4f00c27afdd3faf5a551b24bfe1555533a4d (diff) | |
| download | gitlab-ce-b7835587e507ae9bc8e49c738370f6ef5b9f64fe.tar.gz | |
Change default disabled merge request widget message to "Merge is not allowed yet"39188-change-default-disabled-merge-message
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39188
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js | 5 |
1 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 b8a96b23012..be37dd87de9 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 @@ -286,6 +286,7 @@ export default { <input id="remove-source-branch-input" v-model="removeSourceBranch" + class="js-remove-source-branch-checkbox" :disabled="isRemoveSourceBranchButtonDisabled" type="checkbox"/> Remove source branch </label> @@ -311,8 +312,8 @@ export default { </button> </template> <template v-else> - <span class="bold"> - The pipeline for this merge request has not succeeded yet + <span class="bold js-resolve-mr-widget-items-message"> + You can only merge once the items above are resolved </span> </template> </div> |