lib/generators/ab_admin/install/templates/models/user.rb in ab_admin-0.2.3 vs lib/generators/ab_admin/install/templates/models/user.rb in ab_admin-0.3.0

- old
+ new

@@ -1,15 +1,15 @@ class User < ActiveRecord::Base devise :database_authenticatable, :confirmable, :lockable, #:timeoutable, :recoverable, :rememberable, :trackable, :validatable, :registerable, - :encryptable, :encryptor => :sha512 + :encryptable, encryptor: :sha512 attr_accessible :password, :password_confirmation, :email, :remember_me, :login, :first_name, :last_name, :patronymic, :phone, :skype, :web_site, :address, :birthday, :time_zone, :locale, :bg_color, :gender - attr_accessible :user_role_id, :trust_state, :as => :admin + attr_accessible :user_role_id, :trust_state, as: :admin include AbAdmin::Concerns::AdminAddition include AbAdmin::Models::User fileuploads :avatar