Fix Gemfile.lock

474023b7 · Dmitriy Zaporozhets · 1a1e42ad · 474023b7 · 474023b7
Commit 474023b7 authored May 12, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Gemfile.lock Gemfile.lock +1 -1

db/schema.rb db/schema.rb +1 -1

No files found.
--- 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)

--- 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