Skip to content

Remove LazyRecoverable and dalli (and memcached) #517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 10, 2019
Merged

Remove LazyRecoverable and dalli (and memcached) #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ gem 'has_scope'
gem 'pundit', '~> 2.0.0'
gem 'pg', '0.21.0'
gem 'hstore_translate'
gem 'dalli'
gem 'devise', '~> 4.5.0'
gem "http_accept_language", '~> 2.1.1'
gem 'unicorn'
Expand Down
2 changes: 0 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ GEM
concurrent-ruby (1.1.5)
connection_pool (2.2.1)
crass (1.0.4)
dalli (2.7.2)
database_cleaner (1.6.2)
debug_inspector (0.0.3)
devise (4.5.0)
Expand Down Expand Up @@ -405,7 +404,6 @@ DEPENDENCIES
capistrano-rbenv (~> 2.1)
capybara (~> 3.15)
coffee-rails
dalli
database_cleaner (= 1.6.2)
devise (~> 4.5.0)
dotenv-rails (~> 2.7.1)
Expand Down
18 changes: 0 additions & 18 deletions app/models/concerns/lazy_recoverable.rb
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions app/models/user.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
class User < ActiveRecord::Base
include LazyRecoverable

devise *[
:database_authenticatable,
:recoverable,
Expand Down
2 changes: 1 addition & 1 deletion app/views/devise/passwords/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div class="form-group">
<div class="row">
<div class="col-xs-12">
<%= f.submit t(".send_instructions"), class: "btn btn-primary btn-lg col-xs-12" %>
<%= f.submit t(".send_instructions"), class: "btn btn-primary btn-lg col-xs-12", data: { disable_with: '...' } %>
</div>
</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion config/environments/production.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@

# Use a different cache store in production.
# config.cache_store = :mem_cache_store
config.cache_store = :dalli_store

# Enable serving of images, stylesheets, and JavaScripts from an asset server.
# config.action_controller.asset_host = 'http://assets.example.com'
Expand Down
1 change: 0 additions & 1 deletion config/environments/staging.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@

# Use a different cache store in production.
# config.cache_store = :mem_cache_store
config.cache_store = :dalli_store

# Enable serving of images, stylesheets, and JavaScripts from an asset server.
# config.action_controller.asset_host = 'http://assets.example.com'
Expand Down