diff options
| author | Ryan Harris <harrisryan1@gmail.com> | 2017-01-24 16:08:54 -0500 |
|---|---|---|
| committer | Ryan Harris <harrisryan1@gmail.com> | 2017-01-25 11:12:32 -0500 |
| commit | ca0c05c4d76f9e6dd899f4fe232000360ff54876 (patch) | |
| tree | c88c9fd8170e0e300751c8cda42c16fb1d8a85d0 | |
| parent | 1fe80c296243c92fc4619ae556bc53383c059266 (diff) | |
| download | gitlab-ce-ca0c05c4d76f9e6dd899f4fe232000360ff54876.tar.gz | |
Fixed builds info link on project settings page
| -rw-r--r-- | app/views/projects/_merge_request_merge_settings.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/27178-update-builds-link-in-project-settings.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/_merge_request_merge_settings.html.haml b/app/views/projects/_merge_request_merge_settings.html.haml index afe2fd7fd7b..d549e9d804d 100644 --- a/app/views/projects/_merge_request_merge_settings.html.haml +++ b/app/views/projects/_merge_request_merge_settings.html.haml @@ -8,7 +8,7 @@ %br %span.descr Builds need to be configured to enable this feature. - = link_to icon('question-circle'), help_page_path('user/project/merge_requests/merge_when_build_succeeds', anchor: 'only-allow-merge-requests-to-be-merged-if-the-build-succeeds') + = link_to icon('question-circle'), help_page_path('user/project/merge_requests/merge_when_pipeline_succeeds.md') .checkbox = form.label :only_allow_merge_if_all_discussions_are_resolved do = form.check_box :only_allow_merge_if_all_discussions_are_resolved diff --git a/changelogs/unreleased/27178-update-builds-link-in-project-settings.yml b/changelogs/unreleased/27178-update-builds-link-in-project-settings.yml new file mode 100644 index 00000000000..52406bba464 --- /dev/null +++ b/changelogs/unreleased/27178-update-builds-link-in-project-settings.yml @@ -0,0 +1,4 @@ +--- +title: Updated builds info link on the project settings page +merge_request: +author: Ryan Harris |