diff --git a/.rubocop.yml b/.rubocop.yml index 2d2055d76b54e38c5d461016f7310958def4ef0c..0946ef5d8488cbee69081bd95635e993085f2e1c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -21,7 +21,7 @@ AllCops: - 'lib/email_validator.rb' - 'lib/gitlab/upgrader.rb' - 'lib/gitlab/seeder.rb' - - 'lib/templates/**/*' + - 'generator_templates/**/*' ##################### Style ################################## diff --git a/config/application.rb b/config/application.rb index cba80f38f1f765ba83dadd8e3cb04b1afdb2c01e..06114bf34eebe0376b313af02f67e5330de44c48 100644 --- a/config/application.rb +++ b/config/application.rb @@ -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) diff --git a/lib/templates/active_record/migration/create_table_migration.rb b/generator_templates/active_record/migration/create_table_migration.rb similarity index 100% rename from lib/templates/active_record/migration/create_table_migration.rb rename to generator_templates/active_record/migration/create_table_migration.rb diff --git a/lib/templates/active_record/migration/migration.rb b/generator_templates/active_record/migration/migration.rb similarity index 100% rename from lib/templates/active_record/migration/migration.rb rename to generator_templates/active_record/migration/migration.rb