Skip to content

Commit

Permalink
updated devise config
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Cottman-Fields committed Oct 31, 2012
1 parent 6f01984 commit b502315
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
5 changes: 2 additions & 3 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ class ApplicationController < ActionController::Base
private

def set_stamper
# BUG: I expect this to fail
# TODO: hack while we have no authentication
User.stamper = User.first() #self.current_user
# current_user is provided by devise
User.stamper = self.current_user
end
end
1 change: 1 addition & 0 deletions app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ class User < ActiveRecord::Base
# validation
validates_presence_of :display_name
validates_uniqueness_of :display_name, :email, :case_sensitive => false
has_friendly_id :display_name, :use_slug => true, :strip_non_ascii => true
end

0 comments on commit b502315

Please sign in to comment.