Skip to content

Commit 834b585

Browse files
authored
Merge pull request #306 from brainspec/gemfiles
Update Gemfiles
2 parents 857129c + 6180999 commit 834b585

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
gemfile:
77
- Gemfile
88
- Gemfile.rails42
9-
- Gemfile.rails51
9+
- Gemfile.rails50
1010
- Gemfile.rails52
1111
- Gemfile.mongo_mapper
1212
rvm:

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
eval_gemfile('Gemfile.global')
22

33
gem 'minitest', '~> 5.8'
4-
gem 'rails', '5.0.2', require: false
5-
gem 'activerecord-jdbcsqlite3-adapter', '~> 50.0', platform: :jruby
6-
gem 'activerecord-jdbcpostgresql-adapter', '~> 50.0', platform: :jruby
4+
gem 'rails', '5.1.4', require: false
5+
gem 'activerecord-jdbcsqlite3-adapter', '~> 51.0', platform: :jruby
6+
gem 'activerecord-jdbcpostgresql-adapter', '~> 51.0', platform: :jruby
77
gem 'mongoid'

Gemfile.rails50

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
eval_gemfile('Gemfile.global')
2+
3+
gem 'minitest', '~> 5.8'
4+
gem 'rails', '5.0.6', require: false
5+
gem 'activerecord-jdbcsqlite3-adapter', '~> 51.0', platform: :jruby
6+
gem 'activerecord-jdbcpostgresql-adapter', '~> 51.0', platform: :jruby
7+
gem 'mongoid'

Gemfile.rails51

Lines changed: 0 additions & 7 deletions
This file was deleted.

Gemfile.rails52

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
eval_gemfile('Gemfile.global')
22

33
gem 'minitest', '~> 5.8'
4-
gem 'rails', '5.2.0.beta2', require: false
4+
gem 'rails', '5.2.0.rc1', require: false
55
gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master', platform: :jruby
66
gem 'activerecord-jdbcpostgresql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master', platform: :jruby
77
gem 'mongoid', github: 'mongodb/mongoid'

0 commit comments

Comments
 (0)