Skip to content

Commit 82b08bb

Browse files
mmena1mmena1
authored
Merge pull request #13 from TwilioDevEd/DEVEDSB-152-update-rails
Update Rails to 6.1.3.1 to fix a licensing issue
2 parents 2db035d + 3a25d15 commit 82b08bb

File tree

2 files changed

+91
-120
lines changed

2 files changed

+91
-120
lines changed

‎Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
44
ruby '~> 3.0'
55

66
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
7-
gem 'rails', '~> 6.1.1'
7+
gem 'rails', '~> 6.1'
88
# Use Puma as the app server
99
gem 'puma', '~> 5.0'
1010
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker

‎Gemfile.lock

+90-119
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,85 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.1.1)
5-
actionpack (= 6.1.1)
6-
activesupport (= 6.1.1)
4+
actioncable (6.1.3.1)
5+
actionpack (= 6.1.3.1)
6+
activesupport (= 6.1.3.1)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
9-
actionmailbox (6.1.1)
10-
actionpack (= 6.1.1)
11-
activejob (= 6.1.1)
12-
activerecord (= 6.1.1)
13-
activestorage (= 6.1.1)
14-
activesupport (= 6.1.1)
9+
actionmailbox (6.1.3.1)
10+
actionpack (= 6.1.3.1)
11+
activejob (= 6.1.3.1)
12+
activerecord (= 6.1.3.1)
13+
activestorage (= 6.1.3.1)
14+
activesupport (= 6.1.3.1)
1515
mail (>= 2.7.1)
16-
actionmailer (6.1.1)
17-
actionpack (= 6.1.1)
18-
actionview (= 6.1.1)
19-
activejob (= 6.1.1)
20-
activesupport (= 6.1.1)
16+
actionmailer (6.1.3.1)
17+
actionpack (= 6.1.3.1)
18+
actionview (= 6.1.3.1)
19+
activejob (= 6.1.3.1)
20+
activesupport (= 6.1.3.1)
2121
mail (~> 2.5, >= 2.5.4)
2222
rails-dom-testing (~> 2.0)
23-
actionpack (6.1.1)
24-
actionview (= 6.1.1)
25-
activesupport (= 6.1.1)
23+
actionpack (6.1.3.1)
24+
actionview (= 6.1.3.1)
25+
activesupport (= 6.1.3.1)
2626
rack (~> 2.0, >= 2.0.9)
2727
rack-test (>= 0.6.3)
2828
rails-dom-testing (~> 2.0)
2929
rails-html-sanitizer (~> 1.0, >= 1.2.0)
30-
actiontext (6.1.1)
31-
actionpack (= 6.1.1)
32-
activerecord (= 6.1.1)
33-
activestorage (= 6.1.1)
34-
activesupport (= 6.1.1)
30+
actiontext (6.1.3.1)
31+
actionpack (= 6.1.3.1)
32+
activerecord (= 6.1.3.1)
33+
activestorage (= 6.1.3.1)
34+
activesupport (= 6.1.3.1)
3535
nokogiri (>= 1.8.5)
36-
actionview (6.1.1)
37-
activesupport (= 6.1.1)
36+
actionview (6.1.3.1)
37+
activesupport (= 6.1.3.1)
3838
builder (~> 3.1)
3939
erubi (~> 1.4)
4040
rails-dom-testing (~> 2.0)
4141
rails-html-sanitizer (~> 1.1, >= 1.2.0)
42-
activejob (6.1.1)
43-
activesupport (= 6.1.1)
42+
activejob (6.1.3.1)
43+
activesupport (= 6.1.3.1)
4444
globalid (>= 0.3.6)
45-
activemodel (6.1.1)
46-
activesupport (= 6.1.1)
47-
activerecord (6.1.1)
48-
activemodel (= 6.1.1)
49-
activesupport (= 6.1.1)
50-
activestorage (6.1.1)
51-
actionpack (= 6.1.1)
52-
activejob (= 6.1.1)
53-
activerecord (= 6.1.1)
54-
activesupport (= 6.1.1)
55-
marcel (~> 0.3.1)
56-
mimemagic (~> 0.3.2)
57-
activesupport (6.1.1)
45+
activemodel (6.1.3.1)
46+
activesupport (= 6.1.3.1)
47+
activerecord (6.1.3.1)
48+
activemodel (= 6.1.3.1)
49+
activesupport (= 6.1.3.1)
50+
activestorage (6.1.3.1)
51+
actionpack (= 6.1.3.1)
52+
activejob (= 6.1.3.1)
53+
activerecord (= 6.1.3.1)
54+
activesupport (= 6.1.3.1)
55+
marcel (~> 1.0.0)
56+
mini_mime (~> 1.0.2)
57+
activesupport (6.1.3.1)
5858
concurrent-ruby (~> 1.0, >= 1.0.2)
5959
i18n (>= 1.6, < 2)
6060
minitest (>= 5.1)
6161
tzinfo (~> 2.0)
6262
zeitwerk (~> 2.3)
6363
addressable (2.7.0)
6464
public_suffix (>= 2.0.2, < 5.0)
65-
ast (2.4.1)
66-
autoprefixer-rails (10.2.0.0)
65+
autoprefixer-rails (10.2.4.0)
6766
execjs
6867
bindex (0.8.1)
69-
bootsnap (1.5.1)
68+
bootsnap (1.7.3)
7069
msgpack (~> 1.0)
71-
bootstrap (4.5.3)
70+
bootstrap (4.6.0)
7271
autoprefixer-rails (>= 9.1.0)
7372
popper_js (>= 1.14.3, < 2)
7473
sassc-rails (>= 2.0.0)
7574
builder (3.2.4)
7675
byebug (11.1.3)
77-
capybara (3.34.0)
76+
capybara (3.35.3)
7877
addressable
7978
mini_mime (>= 0.1.3)
8079
nokogiri (~> 1.8)
8180
rack (>= 1.6.0)
8281
rack-test (>= 0.6.3)
83-
regexp_parser (~> 1.5)
82+
regexp_parser (>= 1.5, < 3.0)
8483
xpath (~> 3.2)
8584
childprocess (3.0.0)
8685
concurrent-ruby (1.1.8)
@@ -99,125 +98,100 @@ GEM
9998
multipart-post (>= 1.2, < 3)
10099
ruby2_keywords
101100
faraday-net_http (1.0.1)
102-
ffi (1.14.2)
103-
ffi (1.14.2-x64-mingw32)
101+
ffi (1.15.0)
102+
ffi (1.15.0-x64-mingw32)
104103
globalid (0.4.2)
105104
activesupport (>= 4.2.0)
106105
hashdiff (1.0.1)
107-
i18n (1.8.7)
106+
i18n (1.8.10)
108107
concurrent-ruby (~> 1.0)
109-
jbuilder (2.10.1)
108+
jbuilder (2.11.2)
110109
activesupport (>= 5.0.0)
111110
jwt (2.2.2)
112-
listen (3.4.1)
111+
listen (3.5.1)
113112
rb-fsevent (~> 0.10, >= 0.10.3)
114113
rb-inotify (~> 0.9, >= 0.9.10)
115114
loofah (2.9.0)
116115
crass (~> 1.0.2)
117116
nokogiri (>= 1.5.9)
118117
mail (2.7.1)
119118
mini_mime (>= 0.1.1)
120-
marcel (0.3.3)
121-
mimemagic (~> 0.3.2)
119+
marcel (1.0.1)
122120
method_source (1.0.0)
123-
mimemagic (0.3.5)
124-
mini_mime (1.0.2)
125-
minitest (5.14.3)
126-
msgpack (1.3.3)
121+
mini_mime (1.0.3)
122+
minitest (5.14.4)
123+
msgpack (1.4.2)
127124
multipart-post (2.1.1)
128-
nio4r (2.5.4)
129-
nokogiri (1.11.1-arm64-darwin)
125+
nio4r (2.5.7)
126+
nokogiri (1.11.2-arm64-darwin)
130127
racc (~> 1.4)
131-
nokogiri (1.11.1-x64-mingw32)
128+
nokogiri (1.11.2-x64-mingw32)
132129
racc (~> 1.4)
133-
nokogiri (1.11.1-x86_64-darwin)
130+
nokogiri (1.11.2-x86_64-darwin)
134131
racc (~> 1.4)
135-
nokogiri (1.11.1-x86_64-linux)
132+
nokogiri (1.11.2-x86_64-linux)
136133
racc (~> 1.4)
137-
parallel (1.20.1)
138-
parser (3.0.0.0)
139-
ast (~> 2.4.1)
140134
popper_js (1.16.0)
141135
public_suffix (4.0.6)
142-
puma (5.1.1)
136+
puma (5.2.2)
143137
nio4r (~> 2.0)
144138
racc (1.5.2)
145139
rack (2.2.3)
146-
rack-mini-profiler (2.3.0)
140+
rack-mini-profiler (2.3.1)
147141
rack (>= 1.2.0)
148142
rack-proxy (0.6.5)
149143
rack
150144
rack-test (1.1.0)
151145
rack (>= 1.0, < 3)
152-
rails (6.1.1)
153-
actioncable (= 6.1.1)
154-
actionmailbox (= 6.1.1)
155-
actionmailer (= 6.1.1)
156-
actionpack (= 6.1.1)
157-
actiontext (= 6.1.1)
158-
actionview (= 6.1.1)
159-
activejob (= 6.1.1)
160-
activemodel (= 6.1.1)
161-
activerecord (= 6.1.1)
162-
activestorage (= 6.1.1)
163-
activesupport (= 6.1.1)
146+
rails (6.1.3.1)
147+
actioncable (= 6.1.3.1)
148+
actionmailbox (= 6.1.3.1)
149+
actionmailer (= 6.1.3.1)
150+
actionpack (= 6.1.3.1)
151+
actiontext (= 6.1.3.1)
152+
actionview (= 6.1.3.1)
153+
activejob (= 6.1.3.1)
154+
activemodel (= 6.1.3.1)
155+
activerecord (= 6.1.3.1)
156+
activestorage (= 6.1.3.1)
157+
activesupport (= 6.1.3.1)
164158
bundler (>= 1.15.0)
165-
railties (= 6.1.1)
159+
railties (= 6.1.3.1)
166160
sprockets-rails (>= 2.0.0)
167161
rails-dom-testing (2.0.3)
168162
activesupport (>= 4.2.0)
169163
nokogiri (>= 1.6)
170164
rails-html-sanitizer (1.3.0)
171165
loofah (~> 2.3)
172-
railties (6.1.1)
173-
actionpack (= 6.1.1)
174-
activesupport (= 6.1.1)
166+
railties (6.1.3.1)
167+
actionpack (= 6.1.3.1)
168+
activesupport (= 6.1.3.1)
175169
method_source
176170
rake (>= 0.8.7)
177171
thor (~> 1.0)
178-
rainbow (3.0.0)
179172
rake (13.0.3)
180173
rb-fsevent (0.10.4)
181174
rb-inotify (0.10.1)
182175
ffi (~> 1.0)
183-
regexp_parser (1.8.2)
184-
rexml (3.2.4)
176+
regexp_parser (2.1.1)
177+
rexml (3.2.5)
185178
rspec-core (3.10.1)
186179
rspec-support (~> 3.10.0)
187180
rspec-expectations (3.10.1)
188181
diff-lcs (>= 1.2.0, < 2.0)
189182
rspec-support (~> 3.10.0)
190-
rspec-mocks (3.10.1)
183+
rspec-mocks (3.10.2)
191184
diff-lcs (>= 1.2.0, < 2.0)
192185
rspec-support (~> 3.10.0)
193-
rspec-rails (4.0.2)
194-
actionpack (>= 4.2)
195-
activesupport (>= 4.2)
196-
railties (>= 4.2)
186+
rspec-rails (5.0.1)
187+
actionpack (>= 5.2)
188+
activesupport (>= 5.2)
189+
railties (>= 5.2)
197190
rspec-core (~> 3.10)
198191
rspec-expectations (~> 3.10)
199192
rspec-mocks (~> 3.10)
200193
rspec-support (~> 3.10)
201-
rspec-support (3.10.1)
202-
rubocop (1.8.1)
203-
parallel (~> 1.10)
204-
parser (>= 3.0.0.0)
205-
rainbow (>= 2.2.2, < 4.0)
206-
regexp_parser (>= 1.8, < 3.0)
207-
rexml
208-
rubocop-ast (>= 1.2.0, < 2.0)
209-
ruby-progressbar (~> 1.7)
210-
unicode-display_width (>= 1.4.0, < 3.0)
211-
rubocop-ast (1.4.0)
212-
parser (>= 2.7.1.5)
213-
rubocop-rails (2.9.1)
214-
activesupport (>= 4.2.0)
215-
rack (>= 1.1)
216-
rubocop (>= 0.90.0, < 2.0)
217-
rubocop-rspec (2.1.0)
218-
rubocop (~> 1.0)
219-
rubocop-ast (>= 1.1.0)
220-
ruby-progressbar (1.11.0)
194+
rspec-support (3.10.2)
221195
ruby2_keywords (0.0.4)
222196
rubyzip (2.3.0)
223197
sassc (2.4.0)
@@ -233,7 +207,7 @@ GEM
233207
selenium-webdriver (3.142.7)
234208
childprocess (>= 0.5, < 4.0)
235209
rubyzip (>= 1.2.2)
236-
semantic_range (2.3.1)
210+
semantic_range (3.0.0)
237211
spring (2.1.1)
238212
sprockets (4.0.2)
239213
concurrent-ruby (~> 1.0)
@@ -247,26 +221,25 @@ GEM
247221
turbolinks (5.2.1)
248222
turbolinks-source (~> 5.2)
249223
turbolinks-source (5.2.0)
250-
twilio-ruby (5.46.0)
224+
twilio-ruby (5.50.0)
251225
faraday (>= 0.9, < 2.0)
252226
jwt (>= 1.5, <= 2.5)
253227
nokogiri (>= 1.6, < 2.0)
254228
tzinfo (2.0.4)
255229
concurrent-ruby (~> 1.0)
256-
tzinfo-data (1.2020.6)
230+
tzinfo-data (1.2021.1)
257231
tzinfo (>= 1.0.0)
258-
unicode-display_width (2.0.0)
259232
vcr (6.0.0)
260233
web-console (4.1.0)
261234
actionview (>= 6.0.0)
262235
activemodel (>= 6.0.0)
263236
bindex (>= 0.4.0)
264237
railties (>= 6.0.0)
265-
webdrivers (4.5.0)
238+
webdrivers (4.6.0)
266239
nokogiri (~> 1.6)
267240
rubyzip (>= 1.3.0)
268241
selenium-webdriver (>= 3.0, < 4.0)
269-
webmock (3.11.1)
242+
webmock (3.12.2)
270243
addressable (>= 2.3.6)
271244
crack (>= 0.3.2)
272245
hashdiff (>= 0.4.0, < 2.0.0)
@@ -297,10 +270,8 @@ DEPENDENCIES
297270
listen (~> 3.3)
298271
puma (~> 5.0)
299272
rack-mini-profiler (~> 2.0)
300-
rails (~> 6.1.1)
273+
rails (~> 6.1.3.1)
301274
rspec-rails
302-
rubocop-rails
303-
rubocop-rspec
304275
selenium-webdriver
305276
spring
306277
turbolinks (~> 5)

0 commit comments

Comments
 (0)