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

Former-commit-id: e15ea8b8

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|