ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-22 22:06:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2222 from rails-api/ci_fix

Browse Source 
CI looks like JRuby is still failing sometimes
This commit is contained in:
Benjamin Fleischer 2017-11-19 16:21:26 -06:00 committed by GitHub
commit 41f2e11c4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -54,9 +54,9 @@ group :test do
gem 'sqlite3', platform: (@windows_platforms + [:ruby])
platforms :jruby do
if version == 'master' || version >= '5'
gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' # github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
gem 'activerecord-jdbcsqlite3-adapter', '~> 50'
else
gem 'activerecord-jdbcsqlite3-adapter'
gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.0'
end
end
gem 'codeclimate-test-reporter', require: false