From 20c99bd53a4b4986c013e6e91942a5141000a41e Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 18 Jun 2018 17:44:36 +0300 Subject: [PATCH] Revert "Pull up Devise module" This reverts commit 58effbb --- app/models/admin_user.rb | 2 +- app/models/user.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/admin_user.rb b/app/models/admin_user.rb index c29375d38..d76c42dec 100644 --- a/app/models/admin_user.rb +++ b/app/models/admin_user.rb @@ -9,7 +9,7 @@ class AdminUser < User ROLES = %w(user customer_service admin) # should not match to api_users roles - devise :rememberable, :validatable, :lockable + devise :database_authenticatable, :rememberable, :trackable, :validatable, :lockable def self.min_password_length Devise.password_length.min diff --git a/app/models/user.rb b/app/models/user.rb index 150311e90..b69e0250c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,6 +1,6 @@ class User < ActiveRecord::Base include Versions # version/user_version.rb - devise :database_authenticatable, :trackable, :timeoutable + devise :trackable, :timeoutable attr_accessor :phone