summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Davila <rdavila84@gmail.com>2017-02-13 19:17:19 -0500
committerRuben Davila <rdavila84@gmail.com>2017-02-13 19:17:19 -0500
commit2f77f18f4a15aa3f3c40f1d0aa4ca12c90e7783d (patch)
tree6e364e115e36f4b181f46fd76745829afce142bf
parenta1329ffbd98f4068074a8375835d7cdc3103bbda (diff)
downloadgitlab-ce-2f77f18f4a15aa3f3c40f1d0aa4ca12c90e7783d.tar.gz
Fix migrations with missing DOWNTIME entry
-rw-r--r--db/migrate/20141006143943_move_slack_service_to_webhook.rb2
-rw-r--r--db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb2
2 files changed, 4 insertions, 0 deletions
diff --git a/db/migrate/20141006143943_move_slack_service_to_webhook.rb b/db/migrate/20141006143943_move_slack_service_to_webhook.rb
index 8cb120f7007..6c364c4bf16 100644
--- a/db/migrate/20141006143943_move_slack_service_to_webhook.rb
+++ b/db/migrate/20141006143943_move_slack_service_to_webhook.rb
@@ -1,5 +1,7 @@
# rubocop:disable all
class MoveSlackServiceToWebhook < ActiveRecord::Migration
+ DOWNTIME = false
+
def change
SlackService.all.each do |slack_service|
if ["token", "subdomain"].all? { |property| slack_service.properties.key? property }
diff --git a/db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb b/db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb
index 15ad8e8bcbb..285e798cfea 100644
--- a/db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb
+++ b/db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb
@@ -1,6 +1,8 @@
class AddDevelopersCanMergeToProtectedBranches < ActiveRecord::Migration
include Gitlab::Database::MigrationHelpers
+ DOWNTIME = false
+
disable_ddl_transaction!
def change