summaryrefslogtreecommitdiff
path: root/config/application.rb
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-05-19 14:58:35 -0500
committerYorick Peterse <yorickpeterse@gmail.com>2016-05-19 14:58:35 -0500
commit9429da3ae2d118ca1edcc20e992d0b2863cadeed (patch)
tree00d5ee01380e0133fb87c390fb0dd78129b23b77 /config/application.rb
parent5566c9e7065ef97d65d66abcc1e56ed8b5eb1704 (diff)
downloadgitlab-ce-9429da3ae2d118ca1edcc20e992d0b2863cadeed.tar.gz
Move generator templates to generator_templates/
Since we eager load everything in lib/ putting ERB code in .rb files will result in syntax errors. By moving the templates to ./generator_templates we can work around this.
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb
index cba80f38f1f..06114bf34ee 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -26,6 +26,8 @@ module Gitlab
#{config.root}/app/models/members
#{config.root}/app/models/project_services))
+ config.generators.templates.push("#{config.root}/generator_templates")
+
# Only load the plugins named here, in the order given (default is alphabetical).
# :all can be used as a placeholder for all plugins not explicitly named.
# config.plugins = [ :exception_notification, :ssl_requirement, :all ]
@@ -39,7 +41,7 @@ module Gitlab
config.encoding = "utf-8"
# Configure sensitive parameters which will be filtered from the log file.
- #
+ #
# Parameters filtered:
# - Password (:password, :password_confirmation)
# - Private tokens (:private_token)