Commit c5a5d548 authored by Jeroen van Baarsen's avatar Jeroen van Baarsen

Merge branch 'update-db-schema' into 'master'

Updated the DB schema

This updates `db/schema.rb` which apparently wasn't fully updated in the recent merge requests.

See merge request !4222
parents f26389a0 1472bb92
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20160509201028) do ActiveRecord::Schema.define(version: 20160516174813) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
...@@ -82,6 +82,7 @@ ActiveRecord::Schema.define(version: 20160509201028) do ...@@ -82,6 +82,7 @@ ActiveRecord::Schema.define(version: 20160509201028) do
t.integer "metrics_packet_size", default: 1 t.integer "metrics_packet_size", default: 1
t.text "disabled_oauth_sign_in_sources" t.text "disabled_oauth_sign_in_sources"
t.string "health_check_access_token" t.string "health_check_access_token"
t.boolean "send_user_confirmation_email", default: false
end end
create_table "audit_events", force: :cascade do |t| create_table "audit_events", force: :cascade do |t|
...@@ -633,10 +634,10 @@ ActiveRecord::Schema.define(version: 20160509201028) do ...@@ -633,10 +634,10 @@ ActiveRecord::Schema.define(version: 20160509201028) do
t.string "line_code" t.string "line_code"
t.string "commit_id" t.string "commit_id"
t.integer "noteable_id" t.integer "noteable_id"
t.boolean "system", default: false, null: false t.boolean "system", default: false, null: false
t.text "st_diff" t.text "st_diff"
t.integer "updated_by_id" t.integer "updated_by_id"
t.boolean "is_award", default: false, null: false t.boolean "is_award", default: false, null: false
t.string "type" t.string "type"
end end
......
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