diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-01 13:06:30 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-06-01 13:06:30 +0000 |
| commit | 483d88a9cdc8dc8f699b962c206eaa007aa370ef (patch) | |
| tree | fed5d381bce05e823eb45d7d499c592122f39581 /app/models/user.rb | |
| parent | c72abcefe79dd906cbbf0088b442a8979e9fc746 (diff) | |
| parent | cd74c1434e42f7e6aa12fe2e2b8d9b1e56aea78f (diff) | |
| download | gitlab-ce-483d88a9cdc8dc8f699b962c206eaa007aa370ef.tar.gz | |
Merge branch 'document-not-using-serialize' into 'master'
Document not using ActiveRecord's serialize method
See merge request !11821
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 9e13e91536d..8114d0ff88e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -40,7 +40,7 @@ class User < ActiveRecord::Base otp_secret_encryption_key: Gitlab::Application.secrets.otp_key_base devise :two_factor_backupable, otp_number_of_backup_codes: 10 - serialize :otp_backup_codes, JSON + serialize :otp_backup_codes, JSON # rubocop:disable Cop/ActiverecordSerialize devise :lockable, :recoverable, :rememberable, :trackable, :validatable, :omniauthable, :confirmable, :registerable |