summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-07-06 23:53:49 +0000
committerDouwe Maan <douwe@gitlab.com>2017-07-06 23:53:49 +0000
commit7c096f68476b68784464530ccd89959af872e163 (patch)
treeba9867d4254a59dd618cbc181d9738dc0a1cd8df /config
parente00e2b8fb4aad371cb1d0c359767073a5b8aaafc (diff)
parent920f0159cab8f4e21db4bb1ea9e06d68f7235634 (diff)
downloadgitlab-ce-7c096f68476b68784464530ccd89959af872e163.tar.gz
Merge branch 'fix-routes-in-production-mode' into 'master'
Fix shorter route helpers in production environment Closes #34741 See merge request !12675
Diffstat (limited to 'config')
-rw-r--r--config/application.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb
index 0d82938979a..3e6d72810cd 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -166,8 +166,9 @@ module Gitlab
config.after_initialize do
Rails.application.reload_routes!
+ named_routes_set = Gitlab::Application.routes.named_routes
project_url_helpers = Module.new do
- Gitlab::Application.routes.named_routes.helper_names.each do |name|
+ named_routes_set.helper_names.each do |name|
next unless name.include?('namespace_project')
define_method(name.sub('namespace_project', 'project')) do |project, *args|
@@ -176,6 +177,9 @@ module Gitlab
end
end
+ named_routes_set.url_helpers_module.include project_url_helpers
+ named_routes_set.url_helpers_module.extend project_url_helpers
+
Gitlab::Routing.url_helpers.include project_url_helpers
Gitlab::Routing.url_helpers.extend project_url_helpers