diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-12 11:07:53 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-12 11:07:53 +0000 |
| commit | 95414b83ddcd451fd97383510d6f34c9861096a9 (patch) | |
| tree | 5c9c491dbe2043138835fd857e2d216f2ebefdbb /config | |
| parent | a414f548d2c2dfede96b2d3bd43d1d55a0833391 (diff) | |
| parent | 2ef39a80410540995fe3f64bf38ae0f0adb9fc0f (diff) | |
| download | gitlab-ce-95414b83ddcd451fd97383510d6f34c9861096a9.tar.gz | |
Merge branch 'master' into 40468-empty-states
* master: (54 commits)
Updated image for diff navigation docs
Milestone sidebar docs
Use app host instead of asset host when rendering image blob or diff
ActiveRecord::StaleObjectError: Attempted to update a stale object: Ci::Build
Use shared interceptor in note specs
Ignore temporary table in schema
Check for null in job tooltip title
Clarify casing of I18N placeholder names
fixes some markup issues in the js style guide docs
Fix migration that removes issues.branch_name
small change to make less conflict with EE version
Add cop for use of remove_column
Resolve merge conflicts with dev.gitlab.org/master after security release
add index for doc/administration/operations/
Remove RubySampler#sample_objects for performance as well
Bugfix: User can't change the access level of an access requester
Add spec for removing issues.assignee_id
updated imports
Keep track of storage check timings
Remove a header level in the new 'Automatic CE->EE merge' doc
...
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/active_record_schema_ignore_tables.rb | 2 |
1 files changed, 2 insertions, 0 deletions
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"] |