Yep. I'll change it and self-merge. 

> On Feb 17, 2014, at 7:21 PM, cjcolvar <notifications@github.com> wrote:
> 
> In app/models/user.rb:
> 
> > @@ -49,9 +49,11 @@ def self.find_for_lti(auth_hash, signed_in_resource=nil)
> >        class_name = auth_hash.extra.context_name
> >        Course.create :context_id => class_id, :label => class_name unless class_name.nil?
> >      end
> > -    User.find_or_create_by_username(auth_hash.uid) do |u|
> > -      u.email = auth_hash.info.email
> > +    result = User.where('username = ? OR email = ?', auth_hash.uid, auth_hash.info.email).first
> > +    if result.nil?
> Could you use the result ||= pattern since we seem to use that more than if nil?
> 
> —
> Reply to this email directly or view it on GitHub.