diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-19 22:41:31 +0300 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2016-11-19 23:00:12 +0300 |
| commit | 9a3bb6e3f9c098571ae4d6da8479303fe9a0e8ee (patch) | |
| tree | 4e3fb883c20cd6eb4ec5844717dac66536837d27 | |
| parent | 36a6144b3c66c08b6536c846b2f13e53ce17cdb2 (diff) | |
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
| -rw-r--r-- | db/schema.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/db/schema.rb b/db/schema.rb index d5fc514f26a..db2ce689afc 100644 --- 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| |