diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-26 11:14:58 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-26 11:14:58 +0000 |
| commit | de08c73f9b2def0a433e2af7ff0888466a2006db (patch) | |
| tree | 7b52779c7201d073029b960bd154bb03664ad215 | |
| parent | c02f0808a2de9d8a2baa175280126cb0399103dd (diff) | |
| parent | 7172f38316839f90e8b448a75162f7c0560a3bbe (diff) | |
| download | gitlab-ce-de08c73f9b2def0a433e2af7ff0888466a2006db.tar.gz | |
Merge branch '27178-update-builds-link-in-project-settings' into 'master'
Fixed builds info link on project settings page
Closes #27178
See merge request !8762
| -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..1a1327fb53c 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', anchor: 'only-allow-merge-requests-to-be-merged-if-the-pipeline-succeeds') .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 |