summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-11-17 18:10:28 +0100
committerJames Lopez <james@jameslopez.es>2016-11-17 18:10:28 +0100
commitde96f295a2c08ee2888de91b910d714a15204fb2 (patch)
tree2f33cb597f91218d2a931428790a8db6309e5456 /db
parentd5b673da79c7c350090dc9982a9a2477fac56eb5 (diff)
downloadgitlab-ce-de96f295a2c08ee2888de91b910d714a15204fb2.tar.gz
fix schema.rb
Diffstat (limited to 'db')
-rw-r--r--db/schema.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/db/schema.rb b/db/schema.rb
index 22318612796..983e1c90682 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -98,14 +98,14 @@ ActiveRecord::Schema.define(version: 20161109150329) do
t.text "help_page_text_html"
t.text "shared_runners_text_html"
t.text "after_sign_up_text_html"
+ t.boolean "sidekiq_throttling_enabled", default: false
+ t.string "sidekiq_throttling_queues"
+ t.decimal "sidekiq_throttling_factor"
t.boolean "housekeeping_enabled", default: true, null: false
t.boolean "housekeeping_bitmaps_enabled", default: true, 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_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|
@@ -917,7 +917,7 @@ ActiveRecord::Schema.define(version: 20161109150329) do
t.boolean "has_external_wiki"
t.boolean "lfs_enabled"
t.text "description_html"
- t.boolean "only_allow_merge_if_all_discussions_are_resolved", default: false, null: false
+ t.boolean "only_allow_merge_if_all_discussions_are_resolved"
end
add_index "projects", ["ci_id"], name: "index_projects_on_ci_id", using: :btree