diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-27 11:07:22 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-27 11:07:22 +0000 |
| commit | e9d352612371424592376b81d0a6c5ca234b9fb5 (patch) | |
| tree | 5ebad3973e6af0611aad288c834a8cd509217840 /app | |
| parent | 284a94522fa3359b87f8b1c867d3416515ee8365 (diff) | |
| parent | b7835587e507ae9bc8e49c738370f6ef5b9f64fe (diff) | |
| download | gitlab-ce-e9d352612371424592376b81d0a6c5ca234b9fb5.tar.gz | |
Merge branch '39188-change-default-disabled-merge-message' into 'master'
Change default disabled merge request widget message to be more general
Closes #39188
See merge request gitlab-org/gitlab-ce!14960
Diffstat (limited to 'app')
| -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> |