diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-12-27 16:34:20 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-12-27 16:34:20 +0000 |
commit | 6024697c100e003ec456b9ad2e9461d73250dbb8 (patch) | |
tree | bdcf59573e81e21b1d43b09a47b399f1028f3ee6 /db/post_migrate | |
parent | 123bc1d5ebc102c75456b54cbce8f1ec1bfe0eff (diff) | |
parent | f264ec6ee74a0263b4e5212e921c4638c25f8fcd (diff) | |
download | gitlab-ce-6024697c100e003ec456b9ad2e9461d73250dbb8.tar.gz |
Merge branch 'master' into 'dz-rename-reserved-project-names'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'db/post_migrate')
-rw-r--r-- | db/post_migrate/20161221140236_remove_unneeded_services.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/db/post_migrate/20161221140236_remove_unneeded_services.rb b/db/post_migrate/20161221140236_remove_unneeded_services.rb index a94ccc43a41..6b7e94c8641 100644 --- a/db/post_migrate/20161221140236_remove_unneeded_services.rb +++ b/db/post_migrate/20161221140236_remove_unneeded_services.rb @@ -4,6 +4,8 @@ class RemoveUnneededServices < ActiveRecord::Migration DOWNTIME = false def up + disable_statement_timeout + execute("DELETE FROM services WHERE active = false AND properties = '{}';") end |