Bump devise

parent 94a32b28
......@@ -26,7 +26,7 @@ gem "json-schema", "2.8.1"
# Authentication
gem "devise", "4.5.0"
gem "devise", "4.6.1"
gem "devise_lastseenable", "0.0.6"
# Captcha
......
......@@ -163,7 +163,7 @@ GEM
cucumber-tag_expressions (1.1.1)
cucumber-wire (0.0.1)
database_cleaner (1.7.0)
devise (4.5.0)
devise (4.6.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
......@@ -780,7 +780,7 @@ DEPENDENCIES
cucumber-api-steps (= 0.14)
cucumber-rails (= 1.6.0)
database_cleaner (= 1.7.0)
devise (= 4.5.0)
devise (= 4.6.1)
devise_lastseenable (= 0.0.6)
diaspora-prosody-config (= 0.0.7)
diaspora_federation-json_schema (= 0.2.5)
......
%h2 Resend confirmation instructions
= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name)) do |f|
= devise_error_messages!
= render partial: "devise/shared/error_messages"
%p
= f.label :email
%br/
= f.text_field :email
%p
= f.submit t('.resend_confirmation')
= render :partial => "devise/shared/links"
= render partial: "devise/shared/links"
......@@ -6,7 +6,7 @@
.login-form
.login-container
= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
= devise_error_messages!
= render partial: "devise/shared/error_messages", formats: [:html]
= f.hidden_field :reset_password_token
%fieldset
%legend
......
......@@ -9,7 +9,7 @@
= AppConfig.settings.pod_name
= form_for(resource, as: resource_name, url: password_path(resource_name), html: {class: "form-horizontal block-form"}, autocomplete: 'off') do |f|
- if !devise_error_messages!.empty?
- unless resource.errors.empty?
%legend
%i
= t('devise.passwords.new.no_account') # this is an error message and should not be displayed as a legend
......
......@@ -9,7 +9,7 @@
%fieldset
%legend
=t('devise.passwords.new.forgot_password')
- unless devise_error_messages!.empty?
- unless resource.errors.empty?
%i= t('devise.passwords.new.no_account')
.control-group
......
%h2 Resend unlock instructions
= form_for(resource, :as => resource_name, :url => unlock_path(resource_name)) do |f|
= devise_error_messages!
= render partial: "devise/shared/error_messages"
%p
= f.label :email
%br/
= f.text_field :email
%p
= f.submit t('.resend_unlock')
= render :partial => "devise/shared/links"
= render partial: "devise/shared/links"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment