Commit 2ea8737c authored by Douwe Maan's avatar Douwe Maan

Merge branch '3521-fix-projects-helper' into 'master'

Fix NoMethodErrors caused by incorrect module loading

Closes #3521

See merge request gitlab-org/gitlab-ee!3062
parents 385c983d b555bc3c
module ProjectsHelper module ProjectsHelper
include Gitlab::CurrentSettings include Gitlab::CurrentSettings
prepend ::EE::ProjectsHelper
def link_to_project(project) def link_to_project(project)
link_to [project.namespace.becomes(Namespace), project], title: h(project.name) do link_to [project.namespace.becomes(Namespace), project], title: h(project.name) do
title = content_tag(:span, project.name, class: 'project-name') title = content_tag(:span, project.name, class: 'project-name')
......
module EE module EE
module GitlabRoutingHelper module GitlabRoutingHelper
include ProjectsHelper include ::ProjectsHelper
include ApplicationSettingsHelper include ::ApplicationSettingsHelper
def geo_primary_web_url(project) def geo_primary_web_url(project)
File.join(::Gitlab::Geo.primary_node.url, ::Gitlab::Routing.url_helpers.project_path(project)) File.join(::Gitlab::Geo.primary_node.url, ::Gitlab::Routing.url_helpers.project_path(project))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment