Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
208e2e308c
commit
edfec24c1d
3 changed files with 3 additions and 3 deletions
|
@ -9,7 +9,7 @@ class RemoveAnalyticsRepositoryTableFksOnProjects < ActiveRecord::Migration[5.2]
|
|||
with_lock_retries do
|
||||
# Requires ExclusiveLock on all tables. analytics_* tables are empty
|
||||
remove_foreign_key :analytics_repository_files, :projects
|
||||
remove_foreign_key :analytics_repository_file_edits, :projects
|
||||
remove_foreign_key :analytics_repository_file_edits, :projects if table_exists?(:analytics_repository_file_edits) # this table might be already dropped on development environment
|
||||
remove_foreign_key :analytics_repository_file_commits, :projects
|
||||
end
|
||||
end
|
||||
|
|
|
@ -8,7 +8,7 @@ class RemoveAnalyticsRepositoryFilesFkOnOtherAnalyticsTables < ActiveRecord::Mig
|
|||
def up
|
||||
with_lock_retries do
|
||||
# Requires ExclusiveLock on all tables. analytics_* tables are empty
|
||||
remove_foreign_key :analytics_repository_file_edits, :analytics_repository_files
|
||||
remove_foreign_key :analytics_repository_file_edits, :analytics_repository_files if table_exists?(:analytics_repository_file_edits) # this table might be already dropped on development environment
|
||||
remove_foreign_key :analytics_repository_file_commits, :analytics_repository_files
|
||||
end
|
||||
end
|
||||
|
|
|
@ -7,7 +7,7 @@ class DropAnalyticsRepositoryFileEditsTable < ActiveRecord::Migration[5.2]
|
|||
|
||||
def up
|
||||
# Requires ExclusiveLock on the table. Not in use, no records, no FKs.
|
||||
drop_table :analytics_repository_file_edits
|
||||
drop_table :analytics_repository_file_edits if table_exists?(:analytics_repository_file_edits) # this table might be already dropped on development environment
|
||||
end
|
||||
|
||||
def down
|
||||
|
|
Loading…
Reference in a new issue