diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2016-05-19 21:24:05 +0000 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2016-05-19 21:24:05 +0000 |
| commit | fa7a682bb05080855c8de29535e9626dde63c145 (patch) | |
| tree | 4831151ad5de8c15d986d41714f3cbfc8a335499 | |
| parent | 3f6f2bbe14a7b6da59f87918c84617b8a3e4d1f1 (diff) | |
| parent | e3aaab2d266610e85a452df74bd41e75e86b8df3 (diff) | |
| download | gitlab-ce-fa7a682bb05080855c8de29535e9626dde63c145.tar.gz | |
Merge branch 'fix-generator-templates-directory' into 'master'
Move generator templates to generator_templates/
See merge request !4217
| -rw-r--r-- | .rubocop.yml | 2 | ||||
| -rw-r--r-- | config/application.rb | 4 | ||||
| -rw-r--r-- | generator_templates/active_record/migration/create_table_migration.rb (renamed from lib/templates/active_record/migration/create_table_migration.rb) | 0 | ||||
| -rw-r--r-- | generator_templates/active_record/migration/migration.rb (renamed from lib/templates/active_record/migration/migration.rb) | 0 |
4 files changed, 4 insertions, 2 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 2d2055d76b5..0946ef5d848 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 a96765a3c9b..0e5a77285e5 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) diff --git a/lib/templates/active_record/migration/create_table_migration.rb b/generator_templates/active_record/migration/create_table_migration.rb index 27acc75dcc4..27acc75dcc4 100644 --- a/lib/templates/active_record/migration/create_table_migration.rb +++ b/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 index 06bdea11367..06bdea11367 100644 --- a/lib/templates/active_record/migration/migration.rb +++ b/generator_templates/active_record/migration/migration.rb |