Merge branch 'master' into 'zj-remove-deprecated-ci-service'

# Conflicts:
#   db/schema.rb

2 files changed, 56 insertions, 0 deletions

diff --git a/db/post_migrate/20170206040400_remove_inactive_default_email_services.rb b/db/post_migrate/20170206040400_remove_inactive_default_email_services.rb
new file mode 100644
index 00000000000..a8e63e8bc7d
--- /dev/null
+++ b/db/post_migrate/20170206040400_remove_inactive_default_email_services.rb
@@ -0,0 +1,41 @@
+class RemoveInactiveDefaultEmailServices < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    Gitlab::Database.with_connection_pool(2) do |pool|
+      threads = []
+
+      threads << Thread.new do
+        pool.with_connection do |connection|
+          connection.execute <<-SQL.strip_heredoc
+          DELETE FROM services
+            WHERE type = 'BuildsEmailService'
+              AND active IS FALSE
+              AND properties = '{"notify_only_broken_builds":true}';
+          SQL
+        end
+      end
+
+      threads << Thread.new do
+        pool.with_connection do |connection|
+          connection.execute <<-SQL.strip_heredoc
+          DELETE FROM services
+            WHERE type = 'PipelinesEmailService'
+              AND active IS FALSE
+              AND properties = '{"notify_only_broken_pipelines":true}';
+          SQL
+        end
+      end
+
+      threads.each(&:join)
+    end
+  end
+
+  def down
+    # Nothing can be done to restore the records
+  end
+end
diff --git a/db/post_migrate/20170211073944_disable_invalid_service_templates.rb b/db/post_migrate/20170211073944_disable_invalid_service_templates.rb
new file mode 100644
index 00000000000..84954b1ef64
--- /dev/null
+++ b/db/post_migrate/20170211073944_disable_invalid_service_templates.rb
@@ -0,0 +1,15 @@
+class DisableInvalidServiceTemplates < ActiveRecord::Migration
+  DOWNTIME = false
+
+  unless defined?(Service)
+    class Service < ActiveRecord::Base
+      self.inheritance_column = nil
+    end
+  end
+
+  def up
+    Service.where(template: true, active: true).each do |template|
+      template.update(active: false) unless template.valid?
+    end
+  end
+end