summaryrefslogtreecommitdiff
path: root/db/schema.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2016-08-18 22:50:28 +0100
committerSean McGivern <sean@gitlab.com>2016-08-18 22:50:28 +0100
commitaba9cc6f227a670390cbac0c5da97784afefc5ee (patch)
tree4eaafa3fb7fc948361a63b8b24170d69bddeeced /db/schema.rb
parent883b96ab6a77175d9bac7f03c325428327359cdd (diff)
parent717366d28da11acc6dbe60301bf7e2394400b3c1 (diff)
downloadgitlab-ce-aba9cc6f227a670390cbac0c5da97784afefc5ee.tar.gz
Merge branch 'master' into expiration-date-on-memberships
Diffstat (limited to 'db/schema.rb')
-rw-r--r--db/schema.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb
index 02964d71351..0398aa673cb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1018,6 +1018,7 @@ ActiveRecord::Schema.define(version: 20160818205718) do
t.integer "user_id"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
+ t.string "name"
end
add_index "u2f_registrations", ["key_handle"], name: "index_u2f_registrations_on_key_handle", using: :btree