Merge branch 'remove-dev-rake-task' into improve-registrant-area

This commit is contained in:
Artur Beljajev 2018-06-18 18:05:43 +03:00
commit e564b331ab
3 changed files with 2 additions and 5 deletions

View file

@ -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

View file

@ -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