8000 Try potential fix for jruby hangs by deivid-rodriguez · Pull Request #5858 · activeadmin/activeadmin · GitHub
[go: up one dir, main page]
Skip to content

Try potential fix for jruby hangs #5858

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
Oct 3, 2019
Merged

Try potential fix for jruby hangs #5858

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
2 changes: 1 addition & 1 deletion Gemfile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ group :test do
gem 'capybara', '~> 3.14'
gem 'db-query-matchers', '0.9.0'

gem 'simplecov', require: false # Test coverage generator. Go to /coverage/ after running tests
gem 'simplecov', '0.17.1', require: false # Test coverage generator. Go to /coverage/ after running tests
gem 'cucumber-rails', '~> 1.5', require: false
gem 'cucumber'
gem 'database_cleaner'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ GEM
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
simplecov (0.17.0)
simplecov (0.17.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
Expand Down Expand Up @@ -445,7 +445,7 @@ DEPENDENCIES
rspec-rails
rubocop (= 0.63.1)
rubocop-rspec (~> 1.30)
simplecov
simplecov (= 0.17.1)
sqlite3 (~> 1.4)
yard

Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails_50.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
simplecov (0.17.0)
simplecov (0.17.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
Expand Down Expand Up @@ -356,7 +356,7 @@ DEPENDENCIES
rails-i18n
rake
rspec-rails
simplecov
simplecov (= 0.17.1)
sqlite3 (~> 1.3.6)

BUNDLED WITH
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails_51.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
simplecov (0.17.0)
simplecov (0.17.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
Expand Down Expand Up @@ -356,7 +356,7 @@ DEPENDENCIES
rails-i18n
rake
rspec-rails
simplecov
simplecov (= 0.17.1)
sqlite3 (~> 1.4)

BUNDLED WITH
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails_52.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
simplecov (0.17.0)
simplecov (0.17.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
Expand Down Expand Up @@ -364,7 +364,7 @@ DEPENDENCIES
rails-i18n
rake
rspec-rails
simplecov
simplecov (= 0.17.1)
sqlite3 (~> 1.4)

BUNDLED WITH
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails_60_turbolinks.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
simplecov (0.17.0)
simplecov (0.17.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
Expand Down Expand Up @@ -383,7 +383,7 @@ DEPENDENCIES
rails-i18n
rake
rspec-rails
simplecov
simplecov (= 0.17.1)
sqlite3 (~> 1.4)
turbolinks (~> 5.2)

Expand Down
0