diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-19 19:41:31 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-19 19:41:31 +0000 |
| commit | e15ea8b8f9f5e066dc1e9466445ba0e598c3b98b (patch) | |
| tree | 8198299d8d260fe70f6544e8ac80270710eb9b11 | |
| parent | cb7449594c21f828492b70269d063ad7f08886bd (diff) | |
| parent | b52dd6849d9408f58250e63282ff2d0d7a0c1f78 (diff) | |
| download | gitlab-ce-e15ea8b8f9f5e066dc1e9466445ba0e598c3b98b.tar.gz | |
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| |