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 /app/assets/javascripts/vue_merge_request_widget/stores | |
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 'app/assets/javascripts/vue_merge_request_widget/stores')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js index 3eab8e6fc0b..0f55bebd3fc 100644 --- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js +++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js @@ -31,6 +31,9 @@ export default class MergeRequestStore { this.targetBranchSha = data.target_branch_sha; this.sourceBranch = data.source_branch; this.sourceBranchProtected = data.source_branch_protected; + this.conflictsDocsPath = data.conflicts_docs_path; + this.mergeRequestPipelinesHelpPath = data.merge_request_pipelines_docs_path; + this.mergeTrainWhenPipelineSucceedsDocsPath = data.merge_train_when_pipeline_succeeds_docs_path; this.mergeStatus = data.merge_status; this.commitMessage = data.default_merge_commit_message; this.shortMergeCommitSha = data.short_merge_commit_sha; |