diff --git a/Gemfile b/Gemfile index e386d1131..ef1ede456 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem 'pundit' gem 'pg', '0.17.1' gem 'hstore_translate' gem 'dalli' -gem 'devise', '~> 4.4.1' +gem 'devise', '~> 4.5.0' gem "http_accept_language", '~> 2.1.1' gem 'unicorn' gem 'kaminari', '~> 1.1.1' diff --git a/Gemfile.lock b/Gemfile.lock index ffea63e66..f0f0778ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -117,7 +117,7 @@ GEM dalli (2.7.2) database_cleaner (1.6.2) debug_inspector (0.0.3) - devise (4.4.3) + devise (4.5.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) @@ -411,7 +411,7 @@ DEPENDENCIES coffee-rails dalli database_cleaner (= 1.6.2) - devise (~> 4.4.1) + devise (~> 4.5.0) dotenv-rails (= 1.0.2) elasticsearch-model elasticsearch-rails diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb index 3a0625faf..98cda8bae 100644 --- a/app/views/devise/passwords/edit.html.erb +++ b/app/views/devise/passwords/edit.html.erb @@ -1,32 +1,30 @@
- Currently waiting confirmation for: - <%= resource.unconfirmed_email %> -
- <% end %> -- <%= t(".help_password") %> -
-- <%= t(".help_current_password") %> -
-- <%= t(".unhappy") %> - <%= link_to t(".cancel_account"), registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %> -
-