Skip to content

Commit eced9b0

Browse files
authored
Merge pull request heartcombo#5057 from plataformatec/af-update-ci-with-rails-6
Update CI to rails 6.0.0.beta3
2 parents c1e4031 + dbc3c4f commit eced9b0

2 files changed

Lines changed: 61 additions & 59 deletions

File tree

gemfiles/Gemfile.rails-6.0-beta

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source "https://rubygems.org"
22

33
gemspec path: ".."
44

5-
gem "rails", '6.0.0.beta1'
5+
gem 'rails', '~> 6.0.0.beta3'
66
gem "omniauth"
77
gem "omniauth-oauth2"
88
gem "rdoc"

gemfiles/Gemfile.rails-6.0-beta.lock

Lines changed: 60 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
GIT
22
remote: git://github.com/rails/activemodel-serializers-xml.git
3-
revision: f744aeca2747ed3134e492249c4ee39b548efdf6
3+
revision: 93689638c28525acc65afb638fce866826532641
44
specs:
55
activemodel-serializers-xml (1.0.2)
6-
activemodel (> 5.x)
7-
activesupport (> 5.x)
6+
activemodel (>= 5.0.0.a)
7+
activesupport (>= 5.0.0.a)
88
builder (~> 3.1)
99

1010
PATH
@@ -20,70 +20,71 @@ PATH
2020
GEM
2121
remote: https://rubygems.org/
2222
specs:
23-
actioncable (6.0.0.beta1)
24-
actionpack (= 6.0.0.beta1)
23+
actioncable (6.0.0.beta3)
24+
actionpack (= 6.0.0.beta3)
2525
nio4r (~> 2.0)
2626
websocket-driver (>= 0.6.1)
27-
actionmailbox (6.0.0.beta1)
28-
actionpack (= 6.0.0.beta1)
29-
activejob (= 6.0.0.beta1)
30-
activerecord (= 6.0.0.beta1)
31-
activestorage (= 6.0.0.beta1)
32-
activesupport (= 6.0.0.beta1)
27+
actionmailbox (6.0.0.beta3)
28+
actionpack (= 6.0.0.beta3)
29+
activejob (= 6.0.0.beta3)
30+
activerecord (= 6.0.0.beta3)
31+
activestorage (= 6.0.0.beta3)
32+
activesupport (= 6.0.0.beta3)
3333
mail (>= 2.7.1)
34-
actionmailer (6.0.0.beta1)
35-
actionpack (= 6.0.0.beta1)
36-
actionview (= 6.0.0.beta1)
37-
activejob (= 6.0.0.beta1)
34+
actionmailer (6.0.0.beta3)
35+
actionpack (= 6.0.0.beta3)
36+
actionview (= 6.0.0.beta3)
37+
activejob (= 6.0.0.beta3)
3838
mail (~> 2.5, >= 2.5.4)
3939
rails-dom-testing (~> 2.0)
40-
actionpack (6.0.0.beta1)
41-
actionview (= 6.0.0.beta1)
42-
activesupport (= 6.0.0.beta1)
40+
actionpack (6.0.0.beta3)
41+
actionview (= 6.0.0.beta3)
42+
activesupport (= 6.0.0.beta3)
4343
rack (~> 2.0)
4444
rack-test (>= 0.6.3)
4545
rails-dom-testing (~> 2.0)
4646
rails-html-sanitizer (~> 1.0, >= 1.0.2)
47-
actiontext (6.0.0.beta1)
48-
actionpack (= 6.0.0.beta1)
49-
activerecord (= 6.0.0.beta1)
50-
activestorage (= 6.0.0.beta1)
51-
activesupport (= 6.0.0.beta1)
47+
actiontext (6.0.0.beta3)
48+
actionpack (= 6.0.0.beta3)
49+
activerecord (= 6.0.0.beta3)
50+
activestorage (= 6.0.0.beta3)
51+
activesupport (= 6.0.0.beta3)
5252
nokogiri (>= 1.8.5)
53-
actionview (6.0.0.beta1)
54-
activesupport (= 6.0.0.beta1)
53+
actionview (6.0.0.beta3)
54+
activesupport (= 6.0.0.beta3)
5555
builder (~> 3.1)
5656
erubi (~> 1.4)
5757
rails-dom-testing (~> 2.0)
5858
rails-html-sanitizer (~> 1.0, >= 1.0.3)
59-
activejob (6.0.0.beta1)
60-
activesupport (= 6.0.0.beta1)
59+
activejob (6.0.0.beta3)
60+
activesupport (= 6.0.0.beta3)
6161
globalid (>= 0.3.6)
62-
activemodel (6.0.0.beta1)
63-
activesupport (= 6.0.0.beta1)
64-
activerecord (6.0.0.beta1)
65-
activemodel (= 6.0.0.beta1)
66-
activesupport (= 6.0.0.beta1)
67-
activestorage (6.0.0.beta1)
68-
actionpack (= 6.0.0.beta1)
69-
activerecord (= 6.0.0.beta1)
62+
activemodel (6.0.0.beta3)
63+
activesupport (= 6.0.0.beta3)
64+
activerecord (6.0.0.beta3)
65+
activemodel (= 6.0.0.beta3)
66+
activesupport (= 6.0.0.beta3)
67+
activestorage (6.0.0.beta3)
68+
actionpack (= 6.0.0.beta3)
69+
activerecord (= 6.0.0.beta3)
7070
marcel (~> 0.3.1)
71-
activesupport (6.0.0.beta1)
71+
activesupport (6.0.0.beta3)
7272
concurrent-ruby (~> 1.0, >= 1.0.2)
7373
i18n (>= 0.7, < 2)
7474
minitest (~> 5.1)
7575
tzinfo (~> 1.1)
76+
zeitwerk (~> 1.3, >= 1.3.1)
7677
bcrypt (3.1.12)
7778
builder (3.2.3)
78-
concurrent-ruby (1.1.4)
79+
concurrent-ruby (1.1.5)
7980
crass (1.0.4)
8081
erubi (1.8.0)
8182
faraday (0.15.4)
8283
multipart-post (>= 1.2, < 3)
8384
globalid (0.4.2)
8485
activesupport (>= 4.2.0)
8586
hashie (3.6.0)
86-
i18n (1.5.2)
87+
i18n (1.6.0)
8788
concurrent-ruby (~> 1.0)
8889
jwt (2.1.0)
8990
loofah (2.2.3)
@@ -105,7 +106,7 @@ GEM
105106
multi_xml (0.6.0)
106107
multipart-post (2.0.0)
107108
nio4r (2.3.1)
108-
nokogiri (1.10.1)
109+
nokogiri (1.10.2)
109110
mini_portile2 (~> 2.4.0)
110111
oauth2 (1.4.1)
111112
faraday (>= 0.8, < 0.16.0)
@@ -125,26 +126,26 @@ GEM
125126
omniauth (~> 1.0)
126127
rack-openid (~> 1.3.1)
127128
orm_adapter (0.5.0)
128-
rack (2.0.6)
129+
rack (2.0.7)
129130
rack-openid (1.3.1)
130131
rack (>= 1.1.0)
131132
ruby-openid (>= 2.1.8)
132133
rack-test (1.1.0)
133134
rack (>= 1.0, < 3)
134-
rails (6.0.0.beta1)
135-
actioncable (= 6.0.0.beta1)
136-
actionmailbox (= 6.0.0.beta1)
137-
actionmailer (= 6.0.0.beta1)
138-
actionpack (= 6.0.0.beta1)
139-
actiontext (= 6.0.0.beta1)
140-
actionview (= 6.0.0.beta1)
141-
activejob (= 6.0.0.beta1)
142-
activemodel (= 6.0.0.beta1)
143-
activerecord (= 6.0.0.beta1)
144-
activestorage (= 6.0.0.beta1)
145-
activesupport (= 6.0.0.beta1)
135+
rails (6.0.0.beta3)
136+
actioncable (= 6.0.0.beta3)
137+
actionmailbox (= 6.0.0.beta3)
138+
actionmailer (= 6.0.0.beta3)
139+
actionpack (= 6.0.0.beta3)
140+
actiontext (= 6.0.0.beta3)
141+
actionview (= 6.0.0.beta3)
142+
activejob (= 6.0.0.beta3)
143+
activemodel (= 6.0.0.beta3)
144+
activerecord (= 6.0.0.beta3)
145+
activestorage (= 6.0.0.beta3)
146+
activesupport (= 6.0.0.beta3)
146147
bundler (>= 1.3.0)
147-
railties (= 6.0.0.beta1)
148+
railties (= 6.0.0.beta3)
148149
sprockets-rails (>= 2.0.0)
149150
rails-controller-testing (1.0.4)
150151
actionpack (>= 5.0.1.x)
@@ -155,9 +156,9 @@ GEM
155156
nokogiri (>= 1.6)
156157
rails-html-sanitizer (1.0.4)
157158
loofah (~> 2.2, >= 2.2.2)
158-
railties (6.0.0.beta1)
159-
actionpack (= 6.0.0.beta1)
160-
activesupport (= 6.0.0.beta1)
159+
railties (6.0.0.beta3)
160+
actionpack (= 6.0.0.beta3)
161+
activesupport (= 6.0.0.beta3)
161162
method_source
162163
rake (>= 0.8.7)
163164
thor (>= 0.20.3, < 2.0)
@@ -191,6 +192,7 @@ GEM
191192
websocket-driver (0.7.0)
192193
websocket-extensions (>= 0.1.0)
193194
websocket-extensions (0.1.3)
195+
zeitwerk (1.4.3)
194196

195197
PLATFORMS
196198
ruby
@@ -203,7 +205,7 @@ DEPENDENCIES
203205
omniauth-facebook
204206
omniauth-oauth2
205207
omniauth-openid
206-
rails (= 6.0.0.beta1)
208+
rails (~> 6.0.0.beta3)
207209
rails-controller-testing
208210
rdoc
209211
responders (~> 2.4)
@@ -213,4 +215,4 @@ DEPENDENCIES
213215
webrat (= 0.7.3)
214216

215217
BUNDLED WITH
216-
1.17.1
218+
1.17.2

0 commit comments

Comments
 (0)