diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-05-04 13:55:00 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-05-04 13:55:00 +0000 |
| commit | 275c615557595996f704c9f45b16f435fc70b8e2 (patch) | |
| tree | 212b66a5c7ddd98e6feed0d522a2ed85f0186ae2 /app | |
| parent | 622ad2355a5b780091def7f7752ac88c97520dbb (diff) | |
| parent | 3004386b55fede6381e5e0794c12625e2b83de25 (diff) | |
| download | gitlab-ce-275c615557595996f704c9f45b16f435fc70b8e2.tar.gz | |
Merge branch 'revert-devise-async' into 'master'
Revert "Remove the Devise Async gem."
This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978.
It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.
Resolves #17250.
See merge request !4027
Diffstat (limited to 'app')
| -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 b6f405c6981..ab48f8f1960 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -91,7 +91,7 @@ class User < ActiveRecord::Base devise :two_factor_backupable, otp_number_of_backup_codes: 10 serialize :otp_backup_codes, JSON - devise :lockable, :recoverable, :rememberable, :trackable, + devise :lockable, :async, :recoverable, :rememberable, :trackable, :validatable, :omniauthable, :confirmable, :registerable attr_accessor :force_random_password |