diff --git a/db/migrate/20151215132013_add_pages_size_to_application_settings.rb b/db/migrate/20151215132013_add_pages_size_to_application_settings.rb
index e7fb73190e83fba73a04e4d43468f3fe21553f91..f3a663f805bd8ed78bbae7e508970fe8cb241c94 100644
--- a/db/migrate/20151215132013_add_pages_size_to_application_settings.rb
+++ b/db/migrate/20151215132013_add_pages_size_to_application_settings.rb
@@ -1,5 +1,14 @@
 class AddPagesSizeToApplicationSettings < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+  disable_ddl_transaction!
+
+  DOWNTIME = false
+
   def up
-    add_column :application_settings, :max_pages_size, :integer, default: 100, null: false
+    add_column_with_default :application_settings, :max_pages_size, :integer, default: 100, allow_null: false
+  end
+
+  def down
+    remove_column(:application_settings, :max_pages_size)
   end
 end
diff --git a/db/migrate/20160210105555_create_pages_domain.rb b/db/migrate/20160210105555_create_pages_domain.rb
index 9af206143bd91fd922b0cd836806338ebda0f69e..0e8507c7e9ad678210f991b5ab04ee1f6633ddbe 100644
--- a/db/migrate/20160210105555_create_pages_domain.rb
+++ b/db/migrate/20160210105555_create_pages_domain.rb
@@ -1,4 +1,6 @@
 class CreatePagesDomain < ActiveRecord::Migration
+  DOWNTIME = false
+
   def change
     create_table :pages_domains do |t|
       t.integer :project_id
diff --git a/db/schema.rb b/db/schema.rb
index dc3d8c22e8d0b0fb6380ac45aebbab8274a9fd13..9863367e312525ad9379ddd0bc52eae9e10e2a2d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -61,7 +61,6 @@ ActiveRecord::Schema.define(version: 20170130204620) do
     t.boolean "shared_runners_enabled", default: true, null: false
     t.integer "max_artifacts_size", default: 100, null: false
     t.string "runners_registration_token"
-    t.integer  "max_pages_size", default: 100,   null: false
     t.boolean "require_two_factor_authentication", default: false
     t.integer "two_factor_grace_period", default: 48
     t.boolean "metrics_enabled", default: false
@@ -99,17 +98,18 @@ ActiveRecord::Schema.define(version: 20170130204620) do
     t.text "help_page_text_html"
     t.text "shared_runners_text_html"
     t.text "after_sign_up_text_html"
-    t.boolean "sidekiq_throttling_enabled", default: false
-    t.string "sidekiq_throttling_queues"
-    t.decimal "sidekiq_throttling_factor"
     t.boolean "housekeeping_enabled", default: true, null: false
     t.boolean "housekeeping_bitmaps_enabled", default: true, null: false
     t.integer "housekeeping_incremental_repack_period", default: 10, null: false
     t.integer "housekeeping_full_repack_period", default: 50, null: false
     t.integer "housekeeping_gc_period", default: 200, null: false
+    t.boolean "sidekiq_throttling_enabled", default: false
+    t.string "sidekiq_throttling_queues"
+    t.decimal "sidekiq_throttling_factor"
     t.boolean "html_emails_enabled", default: true
     t.string "plantuml_url"
     t.boolean "plantuml_enabled"
+    t.integer "max_pages_size", default: 100, null: false
   end
 
   create_table "audit_events", force: :cascade do |t|
@@ -857,11 +857,11 @@ ActiveRecord::Schema.define(version: 20170130204620) do
 
   create_table "pages_domains", force: :cascade do |t|
     t.integer "project_id"
-    t.text    "certificate"
-    t.text    "encrypted_key"
-    t.string  "encrypted_key_iv"
-    t.string  "encrypted_key_salt"
-    t.string  "domain"
+    t.text "certificate"
+    t.text "encrypted_key"
+    t.string "encrypted_key_iv"
+    t.string "encrypted_key_salt"
+    t.string "domain"
   end
 
   add_index "pages_domains", ["domain"], name: "index_pages_domains_on_domain", unique: true, using: :btree