diff options
| author | karen Carias <karen@gitlab.com> | 2015-07-16 11:25:12 -0700 |
|---|---|---|
| committer | karen Carias <karen@gitlab.com> | 2015-07-16 11:25:12 -0700 |
| commit | 70a08acedf96b685fea93f759637439884a66aa7 (patch) | |
| tree | 49041f01ed1f0ee4098ac9105d84f5cdbf8baedb /db/schema.rb | |
| parent | 53d40b8ab1275fa39e1ae4b82a228ccf731045f9 (diff) | |
| parent | 9b6f1c59484a0c0e4cee9a27cfa4dc9a89683848 (diff) | |
| download | gitlab-ce-70a08acedf96b685fea93f759637439884a66aa7.tar.gz | |
fixed conflict
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb index fb0982b10fd..d6c34a77ee6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150620233230) do +ActiveRecord::Schema.define(version: 20150713160110) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -517,6 +517,7 @@ ActiveRecord::Schema.define(version: 20150620233230) do t.text "otp_backup_codes" t.string "public_email", default: "", null: false t.integer "dashboard", default: 0 + t.integer "project_view", default: 0 end add_index "users", ["admin"], name: "index_users_on_admin", using: :btree |