1 files changed, 10 insertions, 1 deletions
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb
index 5a5200452de..e995562f0c4 100644
--- a/app/controllers/help_controller.rb
+++ b/app/controllers/help_controller.rb
@@ -84,7 +84,16 @@ class HelpController < ApplicationController
   end
 
   def documentation_base_url
-    @documentation_base_url ||= Gitlab::CurrentSettings.current_application_settings.help_page_documentation_base_url.presence
+    @documentation_base_url ||= documentation_base_url_from_yml_configuration || documentation_base_url_from_db
+  end
+
+  # DEPRECATED
+  def documentation_base_url_from_db
+    Gitlab::CurrentSettings.current_application_settings.help_page_documentation_base_url.presence
+  end
+
+  def documentation_base_url_from_yml_configuration
+    ::Gitlab.config.gitlab_docs.host.presence if ::Gitlab.config.gitlab_docs.enabled
   end
 
   def documentation_file_path