diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-12 14:26:46 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-12 14:26:46 +0300 |
| commit | 474023b71a4aaf2a9072a94cf9f5018d7d9bc2ba (patch) | |
| tree | fb2d96abce589281f90988b133d9a379490e95f9 | |
| parent | 1a1e42ad3115f132947a0399a2c44c734f09b010 (diff) | |
| download | gitlab-ce-474023b71a4aaf2a9072a94cf9f5018d7d9bc2ba.tar.gz | |
Fix Gemfile.lock
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | db/schema.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 14b9a6848ab..9940ab15242 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -723,7 +723,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.2) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.1) - gitlab_git (~> 7.1.10) + gitlab_git (~> 7.1.11) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.1) gollum-lib (~> 4.0.2) diff --git a/db/schema.rb b/db/schema.rb index 6606e13d3d1..c89d22d241c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -492,12 +492,12 @@ ActiveRecord::Schema.define(version: 20150509180749) do t.string "bitbucket_access_token" t.string "bitbucket_access_token_secret" t.string "location" + t.string "public_email", default: "", null: false t.string "encrypted_otp_secret" t.string "encrypted_otp_secret_iv" t.string "encrypted_otp_secret_salt" t.boolean "otp_required_for_login" t.text "otp_backup_codes" - t.string "public_email", default: "", null: false end add_index "users", ["admin"], name: "index_users_on_admin", using: :btree |