Skip to content

Commit d27a1d1

Browse files
authored
Merge pull request #3368 from projectblacklight/fix-devise
Workaround bug in devise
2 parents c50a013 + 49345f6 commit d27a1d1

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

lib/generators/blacklight/user_generator.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ def generate_devise_assets
3535
generate "devise_guests", model_name.classify
3636

3737
gsub_file("config/initializers/devise.rb", "config.sign_out_via = :delete", "config.sign_out_via = :get")
38+
# Work around for https://github.com/heartcombo/devise/issues/5720
39+
gsub_file("config/initializers/devise.rb", "# config.reload_routes = true", "config.reload_routes = false")
3840
end
3941

4042
# Add Blacklight to the user model

tasks/blacklight.rake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ task ci: ['build:npm'] do
4848
Rake::Task['blacklight:internal:seed'].invoke
4949
within_test_app do
5050
# Precompiles the assets
51-
system "bin/rake assets:precompile" # Required due to https://github.com/rails/propshaft/issues/211
51+
system "bin/rake spec:prepare"
5252
end
5353
Rake::Task['blacklight:coverage'].invoke
5454
end

0 commit comments

Comments
 (0)