app/models/user.rb in artfully_ose-1.2.0.pre.9 vs app/models/user.rb in artfully_ose-1.2.0.pre.10

- old
+ new

@@ -1,6 +1,6 @@ - class User < ActiveRecord::Base +class User < ActiveRecord::Base include Ext::DeviseConfiguration include Ext::Integrations::User has_many :shows @@ -8,11 +8,9 @@ has_many :imports has_many :discounts has_many :user_memberships has_many :organizations, :through => :user_memberships - - accepts_nested_attributes_for :user_memberships scope :logged_in_more_than_once, where("users.sign_in_count > 1") def self.generate_password Devise.friendly_token