Merge branch 'fix-db-schema' into 'master'

Remove duplicate sidekiq throttling parameters Improves `db/schema` after merging https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7015. cc @grzesiek @filipa See merge request !7603

Merge branch 'fix-db-schema' into 'master'
e15ea8b8 · Kamil Trzciński · cb744959 · b52dd684 · e15ea8b8
Commit e15ea8b8 authored Nov 19, 2016 by Kamil Trzciński
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

schema.rb db/schema.rb +0 -3

No files found.
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -106,9 +106,6 @@ ActiveRecord::Schema.define(version: 20161117114805) do
    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"
  end

  create_table "audit_events", force: :cascade do |t|