summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/application.rb4
-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
3 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)
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