diff --git a/app/models/user.rb b/app/models/user.rb index 6fc97cd..c19aae2 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -10,7 +10,7 @@ class User < ActiveRecord::Base validates :provider, presence: true, unless: Proc.new { |user| user.uid.nil? || user.uid.blank? } validates :uid, presence: true, uniqueness: { scope: :provider }, unless: Proc.new { |user| user.provider.nil? || user.provider.blank? } - + has_many :project_attributes, class_name: 'ProjectAttributes' has_many :reading_group_attributes, class_name: 'ReadingGroupAttributes' has_many :repository_attributes, class_name: 'RepositoryAttributes' @@ -24,6 +24,6 @@ class User < ActiveRecord::Base protected def password_required? - provider.nil? + provider.nil? && super end end -- libgit2 0.21.2