Merge branch 'merge-settings-help-link' into 'master'

Fix merge requests project settings help link anchor. ## What does this MR do? 8.9.0 added a new project option for merge requests which has a link for help. The link contained an anchor which was being encoded as ```%23``` so change the help link to properly configure the anchor. ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Current release causes 404 error when clicking on the help link in project settings. ## What are the relevant issue numbers? Closes #18982 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4873

Merge branch 'merge-settings-help-link' into 'master'
2f5e3ee6 · Stan Hu · 9d0ef60d · 23c898fc · 2f5e3ee6 · 2f5e3ee6
Commit 2f5e3ee6 authored Jun 23, 2016 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

_merge_request_settings.html.haml app/views/projects/_merge_request_settings.html.haml +1 -1

No files found.
--- 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
  - Improve performance of searching repository tags by name by using a memorized tag array
  - Fix 404 when accessing pipelines as guest user on public projects

--- 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')