diff options
| author | Paul Slaughter <pslaughter@gitlab.com> | 2019-08-15 05:23:37 +0000 |
|---|---|---|
| committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-08-15 05:23:37 +0000 |
| commit | 3d369a6a9987c60b22335301af1270c6cbbc9304 (patch) | |
| tree | 4c62a182c627e1b026a1433d2d0cf106764a5452 /spec/javascripts | |
| parent | d40097b0217517c74e7b654612496583aff550cc (diff) | |
| parent | 896af1acbd69010f5e9648a9b1d9ec59fb9fdd91 (diff) | |
| download | gitlab-ce-3d369a6a9987c60b22335301af1270c6cbbc9304.tar.gz | |
Merge branch 'ce-11982-merge-trains-helper-text' into 'master'
CE backport for gitlab-org/gitlab-ee!14097: Add merge train helper text to merge request widget
See merge request gitlab-org/gitlab-ce!30686
Diffstat (limited to 'spec/javascripts')
| -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, |