Skip to content

Commit 256055b

Browse files
deppbothuacnlee
authored andcommitted
Bundle Update on 2016-06-19 (ruby-china#683)
1 parent 28a1f7b commit 256055b

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

Gemfile.lock

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ GEM
3434
erubis (~> 2.7.0)
3535
rails-dom-testing (~> 1.0, >= 1.0.5)
3636
rails-html-sanitizer (~> 1.0, >= 1.0.2)
37-
active_model_serializers (0.10.0)
38-
actionpack (>= 4.0)
39-
activemodel (>= 4.0)
40-
railties (>= 4.0)
37+
active_model_serializers (0.10.1)
38+
actionpack (>= 4.1, < 6)
39+
activemodel (>= 4.1, < 6)
40+
jsonapi (~> 0.1.1.beta2)
41+
railties (>= 4.1, < 6)
4142
activejob (5.0.0.rc1)
4243
activesupport (= 5.0.0.rc1)
4344
globalid (>= 0.3.6)
@@ -72,7 +73,7 @@ GEM
7273
bundler (~> 1.2)
7374
thor (~> 0.18)
7475
byebug (9.0.5)
75-
cancancan (1.14.0)
76+
cancancan (1.15.0)
7677
capistrano (2.9.0)
7778
highline
7879
net-scp (>= 1.0.0)
@@ -98,7 +99,7 @@ GEM
9899
carrierwave-upyun (0.2.1)
99100
carrierwave (>= 0.5.7)
100101
faraday (>= 0.8.0)
101-
codecov (0.1.4)
102+
codecov (0.1.5)
102103
json
103104
simplecov
104105
url
@@ -194,6 +195,8 @@ GEM
194195
railties (>= 3.1.0)
195196
turbolinks
196197
json (1.8.3)
198+
jsonapi (0.1.1.beta2)
199+
json (~> 1.8)
197200
jwt (1.5.1)
198201
kgio (2.10.0)
199202
launchy (2.4.3)
@@ -392,7 +395,7 @@ GEM
392395
spring (1.7.1)
393396
spring-commands-rspec (1.0.4)
394397
spring (>= 0.9.1)
395-
sprockets (3.6.0)
398+
sprockets (3.6.1)
396399
concurrent-ruby (~> 1.0)
397400
rack (> 1, < 3)
398401
sprockets-rails (3.0.4)

0 commit comments

Comments
 (0)