Skip to content
代码片段 群组 项目
未验证 提交 5fac5fc9 编辑于 作者: Peter Hegman's avatar Peter Hegman 提交者: GitLab
浏览文件

Merge branch 'mg-auto-merge-docs-link-20240729' into 'master'

No related branches found
No related tags found
无相关合并请求
...@@ -10,11 +10,7 @@ export const PIPELINE_MUST_SUCCEED_CONFLICT_TEXT = __( ...@@ -10,11 +10,7 @@ export const PIPELINE_MUST_SUCCEED_CONFLICT_TEXT = __(
); );
export const PIPELINE_SKIPPED_STATUS = 'SKIPPED'; export const PIPELINE_SKIPPED_STATUS = 'SKIPPED';
// TODO: Add documentation const MERGE_WHEN_CHECKS_PASS_HELP = helpPagePath('/user/project/merge_requests/auto_merge.html');
// eslint-disable-next-line local-rules/require-valid-help-page-path
const MERGE_WHEN_CHECKS_PASS_HELP = helpPagePath(
'/user/project/merge_requests/merge_when_checks_pass.html',
);
export default { export default {
computed: { computed: {
...@@ -52,7 +48,7 @@ export default { ...@@ -52,7 +48,7 @@ export default {
} }
return { return {
helpLink: helpPagePath('/user/project/merge_requests/merge_when_pipeline_succeeds.html'), helpLink: helpPagePath('/user/project/merge_requests/auto_merge.html'),
bodyText: __( bodyText: __(
'When the pipeline for this merge request succeeds, it will %{linkStart}automatically merge%{linkEnd}.', 'When the pipeline for this merge request succeeds, it will %{linkStart}automatically merge%{linkEnd}.',
), ),
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册