diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 18:08:10 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 18:08:10 +0000 |
| commit | 5d75b2b9a9d11c20667895e6aa68ea4e76658c5d (patch) | |
| tree | 2aa529b0a153c805f5f4ecb357321a4e4f4c59cb /config | |
| parent | 6f2065c468b05658125b746169c56764a8ccddb1 (diff) | |
| download | gitlab-ce-5d75b2b9a9d11c20667895e6aa68ea4e76658c5d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/active_record_schema_versions.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/initializers/active_record_schema_versions.rb b/config/initializers/active_record_schema_versions.rb new file mode 100644 index 00000000000..a7c342e8053 --- /dev/null +++ b/config/initializers/active_record_schema_versions.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +# Patch to use COPY in db/structure.sql when populating schema_migrations table +# This is intended to reduce potential for merge conflicts in db/structure.sql +ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(Gitlab::Database::PostgresqlAdapter::SchemaVersionsCopyMixin) |