diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-08-07 16:05:17 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-08-07 16:05:17 +0300 |
commit | ad55f0d6f9ec29026b36ee32ff5fc6081e3793de (patch) | |
tree | cd2b9919de1d5597922ac0ac1c2c3dc9a54a0ab0 /db | |
parent | 8b6ae0104df7e053ff3ad06e089c96273854c4e3 (diff) | |
parent | 4b7c2f0b503eb7400cee4cd5011733d689393691 (diff) |
Merge branch 'master' into comment-updated-by
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20150806104937_create_abuse_reports.rb | 11 | ||||
-rw-r--r-- | db/schema.rb | 10 |
2 files changed, 20 insertions, 1 deletions
diff --git a/db/migrate/20150806104937_create_abuse_reports.rb b/db/migrate/20150806104937_create_abuse_reports.rb new file mode 100644 index 00000000000..e97dc4cf04c --- /dev/null +++ b/db/migrate/20150806104937_create_abuse_reports.rb @@ -0,0 +1,11 @@ +class CreateAbuseReports < ActiveRecord::Migration + def change + create_table :abuse_reports do |t| + t.integer :reporter_id + t.integer :user_id + t.text :message + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 36b500c5420..6e919f2883b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,11 +11,19 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150730122406) do +ActiveRecord::Schema.define(version: 20150806104937) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "abuse_reports", force: true do |t| + t.integer "reporter_id" + t.integer "user_id" + t.text "message" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "application_settings", force: true do |t| t.integer "default_projects_limit" t.boolean "signup_enabled" |