Commit e15ea8b8 authored by Kamil Trzciński's avatar Kamil Trzciński

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
parents cb744959 b52dd684
...@@ -106,9 +106,6 @@ ActiveRecord::Schema.define(version: 20161117114805) do ...@@ -106,9 +106,6 @@ ActiveRecord::Schema.define(version: 20161117114805) do
t.integer "housekeeping_incremental_repack_period", default: 10, 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_full_repack_period", default: 50, null: false
t.integer "housekeeping_gc_period", default: 200, 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 end
create_table "audit_events", force: :cascade do |t| create_table "audit_events", force: :cascade do |t|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment