diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-12-11 21:31:02 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-12-11 21:31:02 +0000 |
| commit | 9e9d33134632618b135dc7f6f6e3f0d3d8ab5cdd (patch) | |
| tree | 0050e7add35324e9addd644af2009289e5a53830 | |
| parent | 6930fa3102f0ba197e969f9996e86bf11346470c (diff) | |
| parent | 61267ca9a2d813de24bd1196f1bd23355140eb60 (diff) | |
| download | gitlab-ce-9e9d33134632618b135dc7f6f6e3f0d3d8ab5cdd.tar.gz | |
Merge branch 'mk-fix-schema-dump-of-untracked-files-for-uploads' into 'master'
Ignore temporary table in schema
Closes #40976
See merge request gitlab-org/gitlab-ce!15866
| -rw-r--r-- | changelogs/unreleased/mk-fix-schema-dump-of-untracked-files-for-uploads.yml | 5 | ||||
| -rw-r--r-- | config/initializers/active_record_schema_ignore_tables.rb | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changelogs/unreleased/mk-fix-schema-dump-of-untracked-files-for-uploads.yml b/changelogs/unreleased/mk-fix-schema-dump-of-untracked-files-for-uploads.yml new file mode 100644 index 00000000000..2691e85320c --- /dev/null +++ b/changelogs/unreleased/mk-fix-schema-dump-of-untracked-files-for-uploads.yml @@ -0,0 +1,5 @@ +--- +title: Fix error during schema dump. +merge_request: 15866 +author: +type: fixed diff --git a/config/initializers/active_record_schema_ignore_tables.rb b/config/initializers/active_record_schema_ignore_tables.rb new file mode 100644 index 00000000000..661135f8ade --- /dev/null +++ b/config/initializers/active_record_schema_ignore_tables.rb @@ -0,0 +1,2 @@ +# Ignore table used temporarily in background migration +ActiveRecord::SchemaDumper.ignore_tables = ["untracked_files_for_uploads"] |