Merge remote-tracking branch 'origin/master' into chat-name-authorize

1 files changed, 4 insertions, 1 deletions

diff --git a/db/schema.rb b/db/schema.rb
index 1c1a7a37096..3688df3a238 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -98,6 +98,9 @@ ActiveRecord::Schema.define(version: 20161113184239) 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
@@ -927,7 +930,7 @@ ActiveRecord::Schema.define(version: 20161113184239) do
     t.boolean "has_external_wiki"
     t.boolean "lfs_enabled"
     t.text "description_html"
-    t.boolean "only_allow_merge_if_all_discussions_are_resolved", default: false, null: false
+    t.boolean "only_allow_merge_if_all_discussions_are_resolved"
   end
 
   add_index "projects", ["ci_id"], name: "index_projects_on_ci_id", using: :btree