diff options
| author | Nathan Friend <nathan@gitlab.com> | 2019-08-14 17:09:46 -0400 |
|---|---|---|
| committer | Nathan Friend <nathan@gitlab.com> | 2019-08-14 17:13:09 -0400 |
| commit | 896af1acbd69010f5e9648a9b1d9ec59fb9fdd91 (patch) | |
| tree | ddc23ca8dd69be0b6cda7f3a70b828107207daef /spec/javascripts/vue_mr_widget | |
| parent | b3aa0711f0b35af132329b957315aebdc8813edc (diff) | |
| download | gitlab-ce-896af1acbd69010f5e9648a9b1d9ec59fb9fdd91.tar.gz | |
Add merge train helper text to MR widget (CE)ce-11982-merge-trains-helper-text
This commit adds a helper text that describes what will happen when a
user clicks the "Start/Add to merge train when pipeline succeeds"
button. This text appears at the bottom of the merge request widget.
In addition, this commit renames the "merge_train_info" component to
"merge_train_position_indicator" to avoid ambiguity with the
"merge_train_helper_text" component.
Diffstat (limited to 'spec/javascripts/vue_mr_widget')
| -rw-r--r-- | spec/javascripts/vue_mr_widget/mock_data.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/javascripts/vue_mr_widget/mock_data.js b/spec/javascripts/vue_mr_widget/mock_data.js index 253413ae43e..a55d5537df7 100644 --- a/spec/javascripts/vue_mr_widget/mock_data.js +++ b/spec/javascripts/vue_mr_widget/mock_data.js @@ -233,6 +233,8 @@ export default { 'http://localhost:3000/root/acets-app/commit/53027d060246c8f47e4a9310fb332aa52f221775', troubleshooting_docs_path: 'help', merge_request_pipelines_docs_path: '/help/ci/merge_request_pipelines/index.md', + merge_train_when_pipeline_succeeds_docs_path: + '/help/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/#startadd-to-merge-train-when-pipeline-succeeds', squash: true, visual_review_app_available: true, merge_trains_enabled: true, |