Commit fa7a682b authored by Jeroen van Baarsen's avatar Jeroen van Baarsen

Merge branch 'fix-generator-templates-directory' into 'master'

Move generator templates to generator_templates/



See merge request !4217
parents 3f6f2bbe e3aaab2d
......@@ -21,7 +21,7 @@ AllCops:
- 'lib/email_validator.rb'
- 'lib/gitlab/upgrader.rb'
- 'lib/gitlab/seeder.rb'
- 'lib/templates/**/*'
- 'generator_templates/**/*'
##################### Style ##################################
......
......@@ -26,6 +26,8 @@ class Application < Rails::Application
#{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 @@ class Application < Rails::Application
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)
......
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