devise 1.0.11 → 1.1.0

data/test/test_helpers_test.rb

@@ -1,19 +1,34 @@
-require 'test/test_helper'
+require 'test_helper'
 
 class TestHelpersTest < ActionController::TestCase
   tests UsersController
   include Devise::TestHelpers
 
   test "redirects if attempting to access a page unauthenticated" do
-    get :show
-    assert_redirected_to "/users/sign_in?unauthenticated=true"
+    get :index
+    assert_redirected_to new_user_session_path
+    assert_equal "You need to sign in or sign up before continuing.", flash[:alert]
   end
 
-  test "redirects if attempting to access a page with a unconfirmed account" do
+  test "redirects if attempting to access a page with an unconfirmed account" do
     swap Devise, :confirm_within => 0 do
-      sign_in create_user
-      get :show
-      assert_redirected_to "/users/sign_in?unconfirmed=true"
+      user = create_user
+      assert !user.active?
+
+      sign_in user
+      get :index
+      assert_redirected_to new_user_session_path
+    end
+  end
+
+  test "returns nil if accessing current_user with an unconfirmed account" do
+    swap Devise, :confirm_within => 0 do
+      user = create_user
+      assert !user.active?
+
+      sign_in user
+      get :accept, :id => user
+      assert_nil assigns(:current_user)
     end
   end
 
@@ -22,7 +37,7 @@ class TestHelpersTest < ActionController::TestCase
     user.confirm!
 
     sign_in user
-    get :show
+    get :index
     assert_response :success
   end
 
@@ -31,11 +46,11 @@ class TestHelpersTest < ActionController::TestCase
     user.confirm!
 
     sign_in user
-    get :show
+    get :index
 
     sign_out user
-    get :show
-    assert_redirected_to "/users/sign_in?unauthenticated=true"
+    get :index
+    assert_redirected_to new_user_session_path
   end
 
   test "allows to sign in with different users" do
@@ -43,15 +58,15 @@ class TestHelpersTest < ActionController::TestCase
     first_user.confirm!
 
     sign_in first_user
-    get :show
-    assert_equal first_user.id.to_s, @response.body
+    get :index
+    assert_match /User ##{first_user.id}/, @response.body
     sign_out first_user
 
     second_user = create_user
     second_user.confirm!
 
     sign_in second_user
-    get :show
-    assert_equal second_user.id.to_s, @response.body
+    get :index
+    assert_match /User ##{second_user.id}/, @response.body
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: 
+  hash: 19
+  prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 11
-  version: 1.0.11
+  version: 1.1.0
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 +01:00
+date: 2010-07-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,14 +27,30 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 57
         segments: 
         - 0
         - 10
-        - 3
-        version: 0.10.3
+        - 7
+        version: 0.10.7
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bcrypt-ruby
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 1
+        - 2
+        version: 2.1.2
+  type: :runtime
+  version_requirements: *id002
 description: Flexible authentication solution for Rails with Warden
 email: contact@plataformatec.com.br
 executables: []
@@ -42,45 +58,42 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- CHANGELOG.rdoc
+- Gemfile.lock
+- MIT-LICENSE
 - README.rdoc
 - TODO
 files: 
 - CHANGELOG.rdoc
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
 - TODO
-- app/controllers/confirmations_controller.rb
-- app/controllers/passwords_controller.rb
-- app/controllers/registrations_controller.rb
-- app/controllers/sessions_controller.rb
-- app/controllers/unlocks_controller.rb
-- app/models/devise_mailer.rb
-- app/views/confirmations/new.html.erb
-- app/views/devise_mailer/confirmation_instructions.html.erb
-- app/views/devise_mailer/reset_password_instructions.html.erb
-- app/views/devise_mailer/unlock_instructions.html.erb
-- app/views/passwords/edit.html.erb
-- app/views/passwords/new.html.erb
-- app/views/registrations/edit.html.erb
-- app/views/registrations/new.html.erb
-- app/views/sessions/new.html.erb
-- app/views/shared/_devise_links.erb
-- app/views/unlocks/new.html.erb
-- generators/devise/USAGE
-- generators/devise/devise_generator.rb
-- generators/devise/lib/route_devise.rb
-- generators/devise/templates/migration.rb
-- generators/devise/templates/model.rb
-- generators/devise_install/USAGE
-- generators/devise_install/devise_install_generator.rb
-- generators/devise_install/templates/README
-- generators/devise_install/templates/devise.rb
-- generators/devise_views/USAGE
-- generators/devise_views/devise_views_generator.rb
+- app/controllers/devise/confirmations_controller.rb
+- app/controllers/devise/passwords_controller.rb
+- app/controllers/devise/registrations_controller.rb
+- app/controllers/devise/sessions_controller.rb
+- app/controllers/devise/unlocks_controller.rb
+- app/helpers/devise_helper.rb
+- app/mailers/devise/mailer.rb
+- app/views/devise/confirmations/new.html.erb
+- app/views/devise/mailer/confirmation_instructions.html.erb
+- app/views/devise/mailer/reset_password_instructions.html.erb
+- app/views/devise/mailer/unlock_instructions.html.erb
+- app/views/devise/passwords/edit.html.erb
+- app/views/devise/passwords/new.html.erb
+- app/views/devise/registrations/edit.html.erb
+- app/views/devise/registrations/new.html.erb
+- app/views/devise/sessions/new.html.erb
+- app/views/devise/shared/_links.erb
+- app/views/devise/unlocks/new.html.erb
+- config/locales/en.yml
 - lib/devise.rb
 - lib/devise/controllers/helpers.rb
 - lib/devise/controllers/internal_helpers.rb
+- lib/devise/controllers/scoped_views.rb
 - lib/devise/controllers/url_helpers.rb
 - lib/devise/encryptors/authlogic_sha512.rb
 - lib/devise/encryptors/base.rb
@@ -91,16 +104,15 @@ files:
 - lib/devise/encryptors/sha512.rb
 - lib/devise/failure_app.rb
 - lib/devise/hooks/activatable.rb
+- lib/devise/hooks/forgetable.rb
 - lib/devise/hooks/rememberable.rb
 - lib/devise/hooks/timeoutable.rb
 - lib/devise/hooks/trackable.rb
-- lib/devise/locales/en.yml
 - lib/devise/mapping.rb
 - lib/devise/models.rb
-- lib/devise/models/activatable.rb
+- lib/devise/models/authenticatable.rb
 - lib/devise/models/confirmable.rb
 - lib/devise/models/database_authenticatable.rb
-- lib/devise/models/http_authenticatable.rb
 - lib/devise/models/lockable.rb
 - lib/devise/models/recoverable.rb
 - lib/devise/models/registerable.rb
@@ -109,21 +121,32 @@ files:
 - lib/devise/models/token_authenticatable.rb
 - lib/devise/models/trackable.rb
 - lib/devise/models/validatable.rb
+- lib/devise/modules.rb
 - lib/devise/orm/active_record.rb
-- lib/devise/orm/data_mapper.rb
-- lib/devise/orm/mongo_mapper.rb
+- lib/devise/orm/mongoid.rb
+- lib/devise/path_checker.rb
 - lib/devise/rails.rb
 - lib/devise/rails/routes.rb
 - lib/devise/rails/warden_compat.rb
 - lib/devise/schema.rb
+- lib/devise/strategies/authenticatable.rb
 - lib/devise/strategies/base.rb
 - lib/devise/strategies/database_authenticatable.rb
-- lib/devise/strategies/http_authenticatable.rb
 - lib/devise/strategies/rememberable.rb
 - lib/devise/strategies/token_authenticatable.rb
 - lib/devise/test_helpers.rb
 - lib/devise/version.rb
-- rails/init.rb
+- lib/generators/active_record/devise_generator.rb
+- lib/generators/active_record/templates/migration.rb
+- lib/generators/devise/devise_generator.rb
+- lib/generators/devise/install_generator.rb
+- lib/generators/devise/orm_helpers.rb
+- lib/generators/devise/templates/README
+- lib/generators/devise/templates/devise.rb
+- lib/generators/devise/views_generator.rb
+- lib/generators/devise_install_generator.rb
+- lib/generators/devise_views_generator.rb
+- lib/generators/mongoid/devise_generator.rb
 - test/controllers/helpers_test.rb
 - test/controllers/internal_helpers_test.rb
 - test/controllers/url_helpers_test.rb
@@ -132,9 +155,9 @@ files:
 - test/failure_app_test.rb
 - test/integration/authenticatable_test.rb
 - test/integration/confirmable_test.rb
+- test/integration/database_authenticatable_test.rb
 - test/integration/http_authenticatable_test.rb
 - test/integration/lockable_test.rb
-- test/integration/rack_middleware_test.rb
 - test/integration/recoverable_test.rb
 - test/integration/registerable_test.rb
 - test/integration/rememberable_test.rb
@@ -145,8 +168,8 @@ files:
 - test/mailers/reset_password_instructions_test.rb
 - test/mailers/unlock_instructions_test.rb
 - test/mapping_test.rb
-- test/models/authenticatable_test.rb
 - test/models/confirmable_test.rb
+- test/models/database_authenticatable_test.rb
 - test/models/lockable_test.rb
 - test/models/recoverable_test.rb
 - test/models/rememberable_test.rb
@@ -156,31 +179,40 @@ files:
 - test/models/validatable_test.rb
 - test/models_test.rb
 - test/orm/active_record.rb
-- test/orm/mongo_mapper.rb
+- test/orm/mongoid.rb
 - test/rails_app/app/active_record/admin.rb
+- test/rails_app/app/active_record/shim.rb
 - test/rails_app/app/active_record/user.rb
 - test/rails_app/app/controllers/admins_controller.rb
 - test/rails_app/app/controllers/application_controller.rb
 - test/rails_app/app/controllers/home_controller.rb
+- test/rails_app/app/controllers/publisher/registrations_controller.rb
+- test/rails_app/app/controllers/publisher/sessions_controller.rb
+- test/rails_app/app/controllers/sessions_controller.rb
 - test/rails_app/app/controllers/users_controller.rb
 - test/rails_app/app/helpers/application_helper.rb
-- test/rails_app/app/mongo_mapper/admin.rb
-- test/rails_app/app/mongo_mapper/user.rb
+- test/rails_app/app/mongoid/admin.rb
+- test/rails_app/app/mongoid/shim.rb
+- test/rails_app/app/mongoid/user.rb
+- test/rails_app/config/application.rb
 - test/rails_app/config/boot.rb
 - test/rails_app/config/environment.rb
 - test/rails_app/config/environments/development.rb
 - test/rails_app/config/environments/production.rb
 - test/rails_app/config/environments/test.rb
+- test/rails_app/config/initializers/backtrace_silencers.rb
 - test/rails_app/config/initializers/devise.rb
 - test/rails_app/config/initializers/inflections.rb
-- test/rails_app/config/initializers/new_rails_defaults.rb
-- test/rails_app/config/initializers/session_store.rb
+- test/rails_app/config/initializers/secret_token.rb
 - test/rails_app/config/routes.rb
+- test/rails_app/db/migrate/20100401102949_create_tables.rb
+- test/rails_app/db/schema.rb
 - test/routes_test.rb
-- test/support/assertions_helper.rb
-- test/support/integration_tests_helper.rb
+- test/support/assertions.rb
+- test/support/helpers.rb
+- test/support/integration.rb
 - test/support/test_silencer.rb
-- test/support/tests_helper.rb
+- test/support/webrat/integrations/rails.rb
 - test/test_helper.rb
 - test/test_helpers_test.rb
 has_rdoc: true
@@ -188,8 +220,8 @@ homepage: http://github.com/plataformatec/devise
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -213,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Flexible authentication solution for Rails with Warden
@@ -226,9 +258,9 @@ test_files:
 - test/failure_app_test.rb
 - test/integration/authenticatable_test.rb
 - test/integration/confirmable_test.rb
+- test/integration/database_authenticatable_test.rb
 - test/integration/http_authenticatable_test.rb
 - test/integration/lockable_test.rb
-- test/integration/rack_middleware_test.rb
 - test/integration/recoverable_test.rb
 - test/integration/registerable_test.rb
 - test/integration/rememberable_test.rb
@@ -239,8 +271,8 @@ test_files:
 - test/mailers/reset_password_instructions_test.rb
 - test/mailers/unlock_instructions_test.rb
 - test/mapping_test.rb
-- test/models/authenticatable_test.rb
 - test/models/confirmable_test.rb
+- test/models/database_authenticatable_test.rb
 - test/models/lockable_test.rb
 - test/models/recoverable_test.rb
 - test/models/rememberable_test.rb
@@ -250,30 +282,39 @@ test_files:
 - test/models/validatable_test.rb
 - test/models_test.rb
 - test/orm/active_record.rb
-- test/orm/mongo_mapper.rb
+- test/orm/mongoid.rb
 - test/rails_app/app/active_record/admin.rb
+- test/rails_app/app/active_record/shim.rb
 - test/rails_app/app/active_record/user.rb
 - test/rails_app/app/controllers/admins_controller.rb
 - test/rails_app/app/controllers/application_controller.rb
 - test/rails_app/app/controllers/home_controller.rb
+- test/rails_app/app/controllers/publisher/registrations_controller.rb
+- test/rails_app/app/controllers/publisher/sessions_controller.rb
+- test/rails_app/app/controllers/sessions_controller.rb
 - test/rails_app/app/controllers/users_controller.rb
 - test/rails_app/app/helpers/application_helper.rb
-- test/rails_app/app/mongo_mapper/admin.rb
-- test/rails_app/app/mongo_mapper/user.rb
+- test/rails_app/app/mongoid/admin.rb
+- test/rails_app/app/mongoid/shim.rb
+- test/rails_app/app/mongoid/user.rb
+- test/rails_app/config/application.rb
 - test/rails_app/config/boot.rb
 - test/rails_app/config/environment.rb
 - test/rails_app/config/environments/development.rb
 - test/rails_app/config/environments/production.rb
 - test/rails_app/config/environments/test.rb
+- test/rails_app/config/initializers/backtrace_silencers.rb
 - test/rails_app/config/initializers/devise.rb
 - test/rails_app/config/initializers/inflections.rb
-- test/rails_app/config/initializers/new_rails_defaults.rb
-- test/rails_app/config/initializers/session_store.rb
+- test/rails_app/config/initializers/secret_token.rb
 - test/rails_app/config/routes.rb
+- test/rails_app/db/migrate/20100401102949_create_tables.rb
+- test/rails_app/db/schema.rb
 - test/routes_test.rb
-- test/support/assertions_helper.rb
-- test/support/integration_tests_helper.rb
+- test/support/assertions.rb
+- test/support/helpers.rb
+- test/support/integration.rb
 - test/support/test_silencer.rb
-- test/support/tests_helper.rb
+- test/support/webrat/integrations/rails.rb
 - test/test_helper.rb
 - test/test_helpers_test.rb

data/app/controllers/sessions_controller.rb

@@ -1,42 +0,0 @@
-class SessionsController < ApplicationController
-  prepend_before_filter :require_no_authentication, :only => [ :new, :create ]
-  include Devise::Controllers::InternalHelpers
-
-  # GET /resource/sign_in
-  def new
-    unless flash[:notice].present?
-      Devise::FLASH_MESSAGES.each do |message|
-        set_now_flash_message :alert, message if params.try(:[], message) == "true"
-      end
-    end
-
-    build_resource
-    render_with_scope :new
-  end
-
-  # POST /resource/sign_in
-  def create
-    if resource = authenticate(resource_name)
-      set_flash_message :notice, :signed_in
-      sign_in_and_redirect(resource_name, resource, true)
-    elsif [:custom, :redirect].include?(warden.result)
-      throw :warden, :scope => resource_name
-    else
-      set_now_flash_message :alert, (warden.message || :invalid)
-      clean_up_passwords(build_resource)
-      render_with_scope :new
-    end
-  end
-
-  # GET /resource/sign_out
-  def destroy
-    set_flash_message :notice, :signed_out if signed_in?(resource_name)
-    sign_out_and_redirect(resource_name)
-  end
-
-  protected
-
-    def clean_up_passwords(object)
-      object.clean_up_passwords if object.respond_to?(:clean_up_passwords)
-    end
-end

data/app/models/devise_mailer.rb

@@ -1,68 +0,0 @@
-class DeviseMailer < ::ActionMailer::Base
-  extend Devise::Controllers::InternalHelpers::ScopedViews
-
-  # Deliver confirmation instructions when the user is created or its email is
-  # updated, and also when confirmation is manually requested
-  def confirmation_instructions(record)
-    setup_mail(record, :confirmation_instructions)
-  end
-
-  # Deliver reset password instructions when manually requested
-  def reset_password_instructions(record)
-    setup_mail(record, :reset_password_instructions)
-  end
-
-  def unlock_instructions(record)
-    setup_mail(record, :unlock_instructions)
-  end
-
-  private
-
-    # Configure default email options
-    def setup_mail(record, key)
-      scope_name = Devise::Mapping.find_scope!(record)
-      mapping    = Devise.mappings[scope_name]
-
-      subject      translate(mapping, key)
-      from         mailer_sender(mapping)
-      recipients   record.email
-      sent_on      Time.now
-      content_type Devise.mailer_content_type
-      body         render_with_scope(key, mapping, mapping.name => record, :resource => record)
-    end
-
-    def render_with_scope(key, mapping, assigns)
-      if self.class.scoped_views
-        begin
-          render :file => "devise_mailer/#{mapping.as}/#{key}", :body => assigns
-        rescue ActionView::MissingTemplate
-          render :file => "devise_mailer/#{key}", :body => assigns
-        end
-      else
-        render :file => "devise_mailer/#{key}", :body => assigns
-      end
-    end
-
-    def mailer_sender(mapping)
-      if Devise.mailer_sender.is_a?(Proc)
-        block_args = mapping.name if Devise.mailer_sender.arity > 0
-        Devise.mailer_sender.call(block_args)
-      else
-        Devise.mailer_sender
-      end
-    end
-
-    # Setup subject namespaced by model. It means you're able to setup your
-    # messages using specific resource scope, or provide a default one.
-    # Example (i18n locale file):
-    #
-    #   en:
-    #     devise:
-    #       mailer:
-    #         confirmation_instructions: '...'
-    #         user:
-    #           confirmation_instructions: '...'
-    def translate(mapping, key)
-      I18n.t(:"#{mapping.name}.#{key}", :scope => [:devise, :mailer], :default => key)
-    end
-end

data/app/views/confirmations/new.html.erb

@@ -1,12 +0,0 @@
-<h2>Resend confirmation instructions</h2>
-
-<% form_for resource_name, resource, :url => confirmation_path(resource_name) do |f| %>
-  <%= f.error_messages %>
-
-  <p><%= f.label :email %></p>
-  <p><%= f.text_field :email %></p>
-
-  <p><%= f.submit "Resend confirmation instructions" %></p>
-<% end %>
-
-<%= render :partial => "shared/devise_links" %>

data/app/views/passwords/edit.html.erb

@@ -1,16 +0,0 @@
-<h2>Change your password</h2>
-
-<% form_for resource_name, resource, :url => password_path(resource_name), :html => { :method => :put } do |f| %>
-  <%= f.error_messages %>
-  <%= f.hidden_field :reset_password_token %>
-
-  <p><%= f.label :password %></p>
-  <p><%= f.password_field :password %></p>
-
-  <p><%= f.label :password_confirmation %></p>
-  <p><%= f.password_field :password_confirmation %></p>
-
-  <p><%= f.submit "Change my password" %></p>
-<% end %>
-
-<%= render :partial => "shared/devise_links" %>

data/app/views/passwords/new.html.erb

@@ -1,12 +0,0 @@
-<h2>Forgot your password?</h2>
-
-<% form_for resource_name, resource, :url => password_path(resource_name) do |f| %>
-  <%= f.error_messages %>
-
-  <p><%= f.label :email %></p>
-  <p><%= f.text_field :email %></p>
-
-  <p><%= f.submit "Send me reset password instructions" %></p>
-<% end %>
-
-<%= render :partial => "shared/devise_links" %>

data/app/views/registrations/edit.html.erb

@@ -1,25 +0,0 @@
-<h2>Edit <%= resource_name.to_s.humanize %></h2>
-
-<% form_for resource_name, resource, :url => registration_path(resource_name), :html => { :method => :put } do |f| -%>
-  <%= f.error_messages %>
-
-  <p><%= f.label :email %></p>
-  <p><%= f.text_field :email %></p>
-
-  <p><%= f.label :password %> <i>(leave blank if you don't want to change it)</i></p>
-  <p><%= f.password_field :password %></p>
-
-  <p><%= f.label :password_confirmation %></p>
-  <p><%= f.password_field :password_confirmation %></p>
-
-  <p><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i></p>
-  <p><%= f.password_field :current_password %></p>
-
-  <p><%= f.submit "Update" %></p>
-<% end -%>
-
-<h3>Cancel my account</h3>
-
-<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
-
-<%= render :partial => "shared/devise_links" %>

data/app/views/registrations/new.html.erb

@@ -1,17 +0,0 @@
-<h2>Sign up</h2>
-
-<% form_for resource_name, resource, :url => registration_path(resource_name) do |f| -%>
-  <%= f.error_messages %>
-  <p><%= f.label :email %></p>
-  <p><%= f.text_field :email %></p>
-
-  <p><%= f.label :password %></p>
-  <p><%= f.password_field :password %></p>
-
-  <p><%= f.label :password_confirmation %></p>
-  <p><%= f.password_field :password_confirmation %></p>
-
-  <p><%= f.submit "Sign up" %></p>
-<% end -%>
-
-<%= render :partial => "shared/devise_links" %>

data/app/views/sessions/new.html.erb

@@ -1,17 +0,0 @@
-<h2>Sign in</h2>
-
-<% form_for resource_name, resource, :url => session_path(resource_name) do |f| -%>
-  <p><%= f.label :email %></p>
-  <p><%= f.text_field :email %></p>
-
-  <p><%= f.label :password %></p>
-  <p><%= f.password_field :password %></p>
-
-  <% if devise_mapping.rememberable? -%>
-    <p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p>
-  <% end -%>
-
-  <p><%= f.submit "Sign in" %></p>
-<% end -%>
-
-<%= render :partial => "shared/devise_links" %>

data/app/views/shared/_devise_links.erb

@@ -1,19 +0,0 @@
-<%- if controller_name != 'sessions' %>
-  <%= link_to t('devise.sessions.link'), new_session_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <%= link_to t('devise.registrations.link'), new_registration_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
-  <%= link_to t('devise.passwords.link'), new_password_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <%= link_to t('devise.confirmations.link'), new_confirmation_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.lockable? && controller_name != 'unlocks' %>
-  <%= link_to t('devise.unlocks.link'), new_unlock_path(resource_name) %><br />
-<% end -%>