summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil TrzciƄski <ayufan@ayufan.eu>2017-06-21 15:12:07 +0000
committerkushalpandya <kushal@gitlab.com>2017-06-21 22:00:54 +0530
commit88567c3569b17a8cb3fa7922ebb343e8b8e74c04 (patch)
tree72e9030f65400e37d9be8bc7c48e7899ff2d4ac2
parentee917c0a7c97c4b144705c01ba35440bc03e11cf (diff)
downloadgitlab-ce-88567c3569b17a8cb3fa7922ebb343e8b8e74c04.tar.gz
Merge branch 'fix/gb/improve-autocancel-pipelines-migraton' into 'master'
Disable statement timeout in CI pipelines migration See merge request !12268
-rw-r--r--db/post_migrate/20170502070007_enable_auto_cancel_pending_pipelines_for_all.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/db/post_migrate/20170502070007_enable_auto_cancel_pending_pipelines_for_all.rb b/db/post_migrate/20170502070007_enable_auto_cancel_pending_pipelines_for_all.rb
index 3c13a3d2518..765daa0a347 100644
--- a/db/post_migrate/20170502070007_enable_auto_cancel_pending_pipelines_for_all.rb
+++ b/db/post_migrate/20170502070007_enable_auto_cancel_pending_pipelines_for_all.rb
@@ -7,6 +7,8 @@ class EnableAutoCancelPendingPipelinesForAll < ActiveRecord::Migration
DOWNTIME = false
def up
+ disable_statement_timeout
+
update_column_in_batches(:projects, :auto_cancel_pending_pipelines, 1)
end