From 556c79d6cc3d7b24ecbba3a79f8432eb3fcf5c7e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 2 Dec 2019 15:06:36 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- db/optional_migrations/composite_primary_keys.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'db/optional_migrations') diff --git a/db/optional_migrations/composite_primary_keys.rb b/db/optional_migrations/composite_primary_keys.rb index e0bb0312a35..1fcb9664ff6 100644 --- a/db/optional_migrations/composite_primary_keys.rb +++ b/db/optional_migrations/composite_primary_keys.rb @@ -27,8 +27,6 @@ class CompositePrimaryKeysMigration < ActiveRecord::Migration[4.2] disable_ddl_transaction! def up - return unless Gitlab::Database.postgresql? - disable_statement_timeout do TABLES.each do |index| add_primary_key(index) @@ -37,8 +35,6 @@ class CompositePrimaryKeysMigration < ActiveRecord::Migration[4.2] end def down - return unless Gitlab::Database.postgresql? - disable_statement_timeout do TABLES.each do |index| remove_primary_key(index) -- cgit v1.2.3