update to current master and fix conflictsissue-title-vue

1 files changed, 4 insertions, 0 deletions

diff --git a/db/post_migrate/20170306170512_migrate_legacy_manual_actions.rb b/db/post_migrate/20170306170512_migrate_legacy_manual_actions.rb
index 9020e0d054c..ec6e8cdfc45 100644
--- a/db/post_migrate/20170306170512_migrate_legacy_manual_actions.rb
+++ b/db/post_migrate/20170306170512_migrate_legacy_manual_actions.rb
@@ -4,6 +4,8 @@ class MigrateLegacyManualActions < ActiveRecord::Migration
   DOWNTIME = false
 
   def up
+    disable_statement_timeout
+
     execute <<-EOS
       UPDATE ci_builds SET status = 'manual', allow_failure = true
         WHERE ci_builds.when = 'manual' AND ci_builds.status = 'skipped';
@@ -11,6 +13,8 @@ class MigrateLegacyManualActions < ActiveRecord::Migration
   end
 
   def down
+    disable_statement_timeout
+
     execute <<-EOS
       UPDATE ci_builds SET status = 'skipped', allow_failure = false
         WHERE ci_builds.when = 'manual' AND ci_builds.status = 'manual';