Skip to content
This repository has been archived by the owner on Jul 21, 2020. It is now read-only.

Removed duplicate recently_activated? action #26

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion generators/authenticated/templates/migration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ class <%= migration_name %> < ActiveRecord::Migration
def self.up
create_table "<%= table_name %>", :force => true do |t|
t.string :login, :limit => 40
t.string :name, :limit => 100, :default => '', :null => true
t.string :first, :limit => 100, :default => '', :null => true
t.string :last, :limit => 100, :default => '', :null => true
t.string :email, :limit => 100
t.string :crypted_password, :limit => 40
t.string :salt, :limit => 40
Expand Down
5 changes: 1 addition & 4 deletions generators/authenticated/templates/model.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@ def active?
# the existence of an activation code means they have not activated yet
activation_code.nil?
end

def recently_activated?
@activated
end<% end %>
<% end %>

# Authenticates a user by their login name and unencrypted password. Returns the user or nil.
#
Expand Down