Merge branch 'lfs-helper-doc-link' into 'master'

Use GitLab Routing helpers for the documentation URL in `LfsHelper` To reduce conflicts from changes introduced in gitlab-org/gitlab-ee!740 https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/740#note_15782550 See merge request !6529

Merge branch 'lfs-helper-doc-link' into 'master'
f4f06d00 · Douwe Maan · edebd5e7 · 927ab56c · f4f06d00
Commit f4f06d00 authored Sep 27, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

lfs_helper.rb app/helpers/lfs_helper.rb +5 -3

No files found.
--- a/app/helpers/lfs_helper.rb
+++ b/app/helpers/lfs_helper.rb
 module LfsHelper
+  include Gitlab::Routing.url_helpers
  def require_lfs_enabled!
    return if Gitlab.config.lfs.enabled
    render(
      json: {
        message: 'Git LFS is not enabled on this GitLab server, contact your admin.',
-        documentation_url: "#{Gitlab.config.gitlab.url}/help",
+        documentation_url: help_url,
      },
      status: 501
    )
@@ -46,7 +48,7 @@ module LfsHelper
    render(
      json: {
        message: 'Access forbidden. Check your access level.',
-        documentation_url: "#{Gitlab.config.gitlab.url}/help",
+        documentation_url: help_url,
      },
      content_type: "application/vnd.git-lfs+json",
      status: 403
@@ -57,7 +59,7 @@ module LfsHelper
    render(
      json: {
        message: 'Not found.',
-        documentation_url: "#{Gitlab.config.gitlab.url}/help",
+        documentation_url: help_url,
      },
      content_type: "application/vnd.git-lfs+json",
      status: 404