Also inject new route helpers into includers of GitlabRoutingHelperdm-routing-helpers-fix

1 files changed, 9 insertions, 4 deletions

diff --git a/lib/gitlab/routing.rb b/lib/gitlab/routing.rb
index ac1e864433b..e57890f1143 100644
--- a/lib/gitlab/routing.rb
+++ b/lib/gitlab/routing.rb
@@ -6,21 +6,26 @@ module Gitlab
     self._includers = []
 
     included do
-      Gitlab::Routing._includers << self
+      Gitlab::Routing.includes_helpers(self)
+
       include Gitlab::Routing.url_helpers
     end
 
+    def self.includes_helpers(klass)
+      self._includers << klass
+    end
+
     def self.add_helpers(mod)
       url_helpers.include mod
       url_helpers.extend mod
 
+      GitlabRoutingHelper.include mod
+      GitlabRoutingHelper.extend mod
+
       app_url_helpers = Gitlab::Application.routes.named_routes.url_helpers_module
       app_url_helpers.include mod
       app_url_helpers.extend mod
 
-      GitlabRoutingHelper.include mod
-      GitlabRoutingHelper.extend mod
-
       _includers.each do |klass|
         klass.include mod
       end