summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Norman <steve.norman@thomsonreuters.com>2016-06-23 08:33:05 +0000
committerSteve Norman <steve.norman@thomsonreuters.com>2016-06-23 16:49:58 +0100
commit23c898fc409b28d61ee5af67ef3d8562b40681fc (patch)
treeb6696f28d430c9166d1a265b99de2de484d81f80
parent26b957771974aee4457af5edf389509eb1ac80e7 (diff)
downloadgitlab-ce-23c898fc409b28d61ee5af67ef3d8562b40681fc.tar.gz
Fix merge requests project settings help link anchor.
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/projects/_merge_request_settings.html.haml2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 4e405478825..a7c0d349076 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ v 8.10.0 (unreleased)
- Implement Subresource Integrity for CSS and JavaScript assets. This prevents malicious assets from loading in the case of a CDN compromise.
v 8.9.1
+ - Fix merge requests project settings help link anchor
- Fix GitLab project import issues related to notes and builds
v 8.9.0
diff --git a/app/views/projects/_merge_request_settings.html.haml b/app/views/projects/_merge_request_settings.html.haml
index da522b53417..771a2e0df7d 100644
--- a/app/views/projects/_merge_request_settings.html.haml
+++ b/app/views/projects/_merge_request_settings.html.haml
@@ -8,4 +8,4 @@
%strong Only allow merge requests to be merged if the build succeeds
.help-block
Builds need to be configured to enable this feature.
- = link_to icon('question-circle'), help_page_path('workflow', 'merge_requests#only-allow-merge-requests-to-be-merged-if-the-build-succeeds')
+ = link_to icon('question-circle'), help_page_path('workflow', 'merge_requests', anchor: 'only-allow-merge-requests-to-be-merged-if-the-build-succeeds')