diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-04-24 17:33:54 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-04-26 10:41:48 -0600 |
| commit | 1cc614f2bdd30b4fce35ee9e680f9272b9012978 (patch) | |
| tree | deaa190c655512f692916475874b6385848c684d /app | |
| parent | b65c4abd7409e681682e18acf070718af11a0851 (diff) | |
| download | gitlab-ce-1cc614f2bdd30b4fce35ee9e680f9272b9012978.tar.gz | |
Remove the Devise Async gem.
The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration.
Resolves #15575.
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 ab48f8f1960..b6f405c6981 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, :async, :recoverable, :rememberable, :trackable, + devise :lockable, :recoverable, :rememberable, :trackable, :validatable, :omniauthable, :confirmable, :registerable attr_accessor :force_random_password |