Automatic merge of gitlab-org/gitlab-ce master

4437f7c4 · GitLab Bot · 25f058c9 · d80fbb73 · 4437f7c4
Commit 4437f7c4 authored Apr 02, 2019 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

app/models/personal_access_token.rb app/models/personal_access_token.rb +0 -2

No files found.
--- a/app/models/personal_access_token.rb
+++ b/app/models/personal_access_token.rb
@@ -2,11 +2,9 @@

 class PersonalAccessToken < ApplicationRecord
  include Expirable
-  include IgnorableColumn
  include TokenAuthenticatable

  add_authentication_token_field :token, digest: true
-  ignore_column :token

  REDIS_EXPIRY_TIME = 3.minutes