diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-02 18:06:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-02 18:06:36 +0300 |
commit | 556c79d6cc3d7b24ecbba3a79f8432eb3fcf5c7e (patch) | |
tree | 93c84c603316cdee73ce85949ba70e29ef78af32 /db/optional_migrations | |
parent | bffcdf9bca11a4d43cc40e3f382f03088d36f7c6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db/optional_migrations')
-rw-r--r-- | db/optional_migrations/composite_primary_keys.rb | 4 |
1 files changed, 0 insertions, 4 deletions
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) |