Update 8.14-rc1 migrations to minimize downtime and deploy time

See https://gitlab.com/gitlab-org/gitlab-ce/issues/24386

2 files changed, 1 insertions, 14 deletions

diff --git a/db/migrate/20160914131004_only_allow_merge_if_all_discussions_are_resolved.rb b/db/migrate/20160914131004_only_allow_merge_if_all_discussions_are_resolved.rb
index fad62d716b3..4da5ec9bd28 100644
--- a/db/migrate/20160914131004_only_allow_merge_if_all_discussions_are_resolved.rb
+++ b/db/migrate/20160914131004_only_allow_merge_if_all_discussions_are_resolved.rb
@@ -5,10 +5,7 @@ class OnlyAllowMergeIfAllDiscussionsAreResolved < ActiveRecord::Migration
   disable_ddl_transaction!
 
   def up
-    add_column_with_default(:projects,
-                            :only_allow_merge_if_all_discussions_are_resolved,
-                            :boolean,
-                            default: false)
+    add_column :projects, :only_allow_merge_if_all_discussions_are_resolved, :boolean
   end
 
   def down
diff --git a/db/migrate/20161011222551_remove_inactive_jira_service_properties.rb b/db/migrate/20161011222551_remove_inactive_jira_service_properties.rb
deleted file mode 100644
index 319d86ac159..00000000000
--- a/db/migrate/20161011222551_remove_inactive_jira_service_properties.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class RemoveInactiveJiraServiceProperties < ActiveRecord::Migration
-  include Gitlab::Database::MigrationHelpers
-
-  DOWNTIME = true
-  DOWNTIME_REASON = "Removes all inactive jira_service properties"
-
-  def up
-    execute("UPDATE services SET properties = '{}' WHERE services.type = 'JiraService' and services.active = false")
-  end
-end