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 (cherry picked from commit 9e9d3313) 61267ca9 Ignore temporary table in schema

Merge branch 'mk-fix-schema-dump-of-untracked-files-for-uploads' into 'master'
7f88b092 · Stan Hu · LUKE BENNETT · 75f28ea4 · 7f88b092 · 7f88b092
Commit 7f88b092 authored Dec 11, 2017 by Stan Hu Committed by LUKE BENNETT Dec 13, 2017
Showing with 7 additions and 0 deletions

mk-fix-schema-dump-of-untracked-files-for-uploads.yml ...sed/mk-fix-schema-dump-of-untracked-files-for-uploads.yml +5 -0

active_record_schema_ignore_tables.rb config/initializers/active_record_schema_ignore_tables.rb +2 -0

No files found.
--- 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
+---
+title: Fix error during schema dump.
+merge_request: 15866
+author:
+type: fixed
--- a/config/initializers/active_record_schema_ignore_tables.rb
+++ b/config/initializers/active_record_schema_ignore_tables.rb
+# Ignore table used temporarily in background migration
+ActiveRecord::SchemaDumper.ignore_tables = ["untracked_files_for_uploads"]