Skip to content

Commit b61f112

Browse files
authored
Merge pull request #23 from skunkworker/upgrade_rails
upgrade gemfile and rails
2 parents e2e4fa0 + 562d2c7 commit b61f112

File tree

2 files changed

+90
-90
lines changed

2 files changed

+90
-90
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
44
ruby '2.6.5'
55

66
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
7-
gem 'rails', '~> 6.0.1'
7+
gem 'rails', '~> 6.0.3.3'
88
# Use sqlite3 as the database for Active Record
99
gem 'sqlite3', '~> 1.4'
1010
# Use Puma as the app server

Gemfile.lock

Lines changed: 89 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.0.2.1)
5-
actionpack (= 6.0.2.1)
4+
actioncable (6.0.3.4)
5+
actionpack (= 6.0.3.4)
66
nio4r (~> 2.0)
77
websocket-driver (>= 0.6.1)
8-
actionmailbox (6.0.2.1)
9-
actionpack (= 6.0.2.1)
10-
activejob (= 6.0.2.1)
11-
activerecord (= 6.0.2.1)
12-
activestorage (= 6.0.2.1)
13-
activesupport (= 6.0.2.1)
8+
actionmailbox (6.0.3.4)
9+
actionpack (= 6.0.3.4)
10+
activejob (= 6.0.3.4)
11+
activerecord (= 6.0.3.4)
12+
activestorage (= 6.0.3.4)
13+
activesupport (= 6.0.3.4)
1414
mail (>= 2.7.1)
15-
actionmailer (6.0.2.1)
16-
actionpack (= 6.0.2.1)
17-
actionview (= 6.0.2.1)
18-
activejob (= 6.0.2.1)
15+
actionmailer (6.0.3.4)
16+
actionpack (= 6.0.3.4)
17+
actionview (= 6.0.3.4)
18+
activejob (= 6.0.3.4)
1919
mail (~> 2.5, >= 2.5.4)
2020
rails-dom-testing (~> 2.0)
21-
actionpack (6.0.2.1)
22-
actionview (= 6.0.2.1)
23-
activesupport (= 6.0.2.1)
21+
actionpack (6.0.3.4)
22+
actionview (= 6.0.3.4)
23+
activesupport (= 6.0.3.4)
2424
rack (~> 2.0, >= 2.0.8)
2525
rack-test (>= 0.6.3)
2626
rails-dom-testing (~> 2.0)
2727
rails-html-sanitizer (~> 1.0, >= 1.2.0)
28-
actiontext (6.0.2.1)
29-
actionpack (= 6.0.2.1)
30-
activerecord (= 6.0.2.1)
31-
activestorage (= 6.0.2.1)
32-
activesupport (= 6.0.2.1)
28+
actiontext (6.0.3.4)
29+
actionpack (= 6.0.3.4)
30+
activerecord (= 6.0.3.4)
31+
activestorage (= 6.0.3.4)
32+
activesupport (= 6.0.3.4)
3333
nokogiri (>= 1.8.5)
34-
actionview (6.0.2.1)
35-
activesupport (= 6.0.2.1)
34+
actionview (6.0.3.4)
35+
activesupport (= 6.0.3.4)
3636
builder (~> 3.1)
3737
erubi (~> 1.4)
3838
rails-dom-testing (~> 2.0)
@@ -42,33 +42,33 @@ GEM
4242
activemodel (>= 4.1, < 6.1)
4343
case_transform (>= 0.2)
4444
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
45-
activejob (6.0.2.1)
46-
activesupport (= 6.0.2.1)
45+
activejob (6.0.3.4)
46+
activesupport (= 6.0.3.4)
4747
globalid (>= 0.3.6)
48-
activemodel (6.0.2.1)
49-
activesupport (= 6.0.2.1)
50-
activerecord (6.0.2.1)
51-
activemodel (= 6.0.2.1)
52-
activesupport (= 6.0.2.1)
53-
activestorage (6.0.2.1)
54-
actionpack (= 6.0.2.1)
55-
activejob (= 6.0.2.1)
56-
activerecord (= 6.0.2.1)
48+
activemodel (6.0.3.4)
49+
activesupport (= 6.0.3.4)
50+
activerecord (6.0.3.4)
51+
activemodel (= 6.0.3.4)
52+
activesupport (= 6.0.3.4)
53+
activestorage (6.0.3.4)
54+
actionpack (= 6.0.3.4)
55+
activejob (= 6.0.3.4)
56+
activerecord (= 6.0.3.4)
5757
marcel (~> 0.3.1)
58-
activesupport (6.0.2.1)
58+
activesupport (6.0.3.4)
5959
concurrent-ruby (~> 1.0, >= 1.0.2)
6060
i18n (>= 0.7, < 2)
6161
minitest (~> 5.1)
6262
tzinfo (~> 1.1)
63-
zeitwerk (~> 2.2)
63+
zeitwerk (~> 2.2, >= 2.2.2)
6464
addressable (2.7.0)
6565
public_suffix (>= 2.0.2, < 5.0)
6666
bindex (0.8.1)
67-
bootsnap (1.4.5)
67+
bootsnap (1.4.8)
6868
msgpack (~> 1.0)
6969
builder (3.2.4)
70-
byebug (11.0.1)
71-
capybara (3.30.0)
70+
byebug (11.1.3)
71+
capybara (3.33.0)
7272
addressable
7373
mini_mime (>= 0.1.3)
7474
nokogiri (~> 1.8)
@@ -79,89 +79,89 @@ GEM
7979
case_transform (0.2)
8080
activesupport
8181
childprocess (3.0.0)
82-
concurrent-ruby (1.1.5)
83-
crass (1.0.5)
82+
concurrent-ruby (1.1.7)
83+
crass (1.0.6)
8484
erubi (1.9.0)
85-
ffi (1.11.3)
86-
foreman (0.86.0)
85+
ffi (1.13.1)
86+
foreman (0.87.2)
8787
globalid (0.4.2)
8888
activesupport (>= 4.2.0)
89-
httparty (0.17.3)
89+
httparty (0.18.1)
9090
mime-types (~> 3.0)
9191
multi_xml (>= 0.5.2)
92-
i18n (1.7.0)
92+
i18n (1.8.5)
9393
concurrent-ruby (~> 1.0)
94-
jbuilder (2.9.1)
95-
activesupport (>= 4.2.0)
94+
jbuilder (2.10.1)
95+
activesupport (>= 5.0.0)
9696
jsonapi-renderer (0.2.2)
9797
listen (3.1.5)
9898
rb-fsevent (~> 0.9, >= 0.9.4)
9999
rb-inotify (~> 0.9, >= 0.9.7)
100100
ruby_dep (~> 1.2)
101-
loofah (2.4.0)
101+
loofah (2.7.0)
102102
crass (~> 1.0.2)
103103
nokogiri (>= 1.5.9)
104104
mail (2.7.1)
105105
mini_mime (>= 0.1.1)
106106
marcel (0.3.3)
107107
mimemagic (~> 0.3.2)
108-
method_source (0.9.2)
108+
method_source (1.0.0)
109109
mime-types (3.3.1)
110110
mime-types-data (~> 3.2015)
111-
mime-types-data (3.2019.1009)
112-
mimemagic (0.3.3)
111+
mime-types-data (3.2020.0512)
112+
mimemagic (0.3.5)
113113
mini_mime (1.0.2)
114114
mini_portile2 (2.4.0)
115-
minitest (5.13.0)
116-
msgpack (1.3.1)
115+
minitest (5.14.2)
116+
msgpack (1.3.3)
117117
multi_xml (0.6.0)
118-
nio4r (2.5.2)
119-
nokogiri (1.10.7)
118+
nio4r (2.5.4)
119+
nokogiri (1.10.10)
120120
mini_portile2 (~> 2.4.0)
121-
public_suffix (4.0.2)
122-
puma (4.3.1)
121+
public_suffix (4.0.6)
122+
puma (4.3.6)
123123
nio4r (~> 2.0)
124-
rack (2.0.8)
124+
rack (2.2.3)
125125
rack-proxy (0.6.5)
126126
rack
127127
rack-test (1.1.0)
128128
rack (>= 1.0, < 3)
129-
rails (6.0.2.1)
130-
actioncable (= 6.0.2.1)
131-
actionmailbox (= 6.0.2.1)
132-
actionmailer (= 6.0.2.1)
133-
actionpack (= 6.0.2.1)
134-
actiontext (= 6.0.2.1)
135-
actionview (= 6.0.2.1)
136-
activejob (= 6.0.2.1)
137-
activemodel (= 6.0.2.1)
138-
activerecord (= 6.0.2.1)
139-
activestorage (= 6.0.2.1)
140-
activesupport (= 6.0.2.1)
129+
rails (6.0.3.4)
130+
actioncable (= 6.0.3.4)
131+
actionmailbox (= 6.0.3.4)
132+
actionmailer (= 6.0.3.4)
133+
actionpack (= 6.0.3.4)
134+
actiontext (= 6.0.3.4)
135+
actionview (= 6.0.3.4)
136+
activejob (= 6.0.3.4)
137+
activemodel (= 6.0.3.4)
138+
activerecord (= 6.0.3.4)
139+
activestorage (= 6.0.3.4)
140+
activesupport (= 6.0.3.4)
141141
bundler (>= 1.3.0)
142-
railties (= 6.0.2.1)
142+
railties (= 6.0.3.4)
143143
sprockets-rails (>= 2.0.0)
144144
rails-dom-testing (2.0.3)
145145
activesupport (>= 4.2.0)
146146
nokogiri (>= 1.6)
147147
rails-html-sanitizer (1.3.0)
148148
loofah (~> 2.3)
149-
railties (6.0.2.1)
150-
actionpack (= 6.0.2.1)
151-
activesupport (= 6.0.2.1)
149+
railties (6.0.3.4)
150+
actionpack (= 6.0.3.4)
151+
activesupport (= 6.0.3.4)
152152
method_source
153153
rake (>= 0.8.7)
154154
thor (>= 0.20.3, < 2.0)
155155
rake (13.0.1)
156-
rb-fsevent (0.10.3)
156+
rb-fsevent (0.10.4)
157157
rb-inotify (0.10.1)
158158
ffi (~> 1.0)
159-
regexp_parser (1.6.0)
159+
regexp_parser (1.8.1)
160160
ruby_dep (1.5.0)
161-
rubyzip (2.0.0)
161+
rubyzip (2.3.0)
162162
sass-rails (6.0.0)
163163
sassc-rails (~> 2.1, >= 2.1.1)
164-
sassc (2.2.1)
164+
sassc (2.4.0)
165165
ffi (~> 1.9)
166166
sassc-rails (2.1.2)
167167
railties (>= 4.0.0)
@@ -172,14 +172,14 @@ GEM
172172
selenium-webdriver (3.142.7)
173173
childprocess (>= 0.5, < 4.0)
174174
rubyzip (>= 1.2.2)
175-
spring (2.1.0)
175+
spring (2.1.1)
176176
spring-watcher-listen (2.0.1)
177177
listen (>= 2.7, < 4.0)
178178
spring (>= 1.2, < 3.0)
179-
sprockets (4.0.0)
179+
sprockets (4.0.2)
180180
concurrent-ruby (~> 1.0)
181181
rack (> 1, < 3)
182-
sprockets-rails (3.2.1)
182+
sprockets-rails (3.2.2)
183183
actionpack (>= 4.0)
184184
activesupport (>= 4.0)
185185
sprockets (>= 3.0.0)
@@ -190,27 +190,27 @@ GEM
190190
turbolinks (5.2.1)
191191
turbolinks-source (~> 5.2)
192192
turbolinks-source (5.2.0)
193-
tzinfo (1.2.6)
193+
tzinfo (1.2.7)
194194
thread_safe (~> 0.1)
195-
web-console (4.0.1)
195+
web-console (4.0.4)
196196
actionview (>= 6.0.0)
197197
activemodel (>= 6.0.0)
198198
bindex (>= 0.4.0)
199199
railties (>= 6.0.0)
200-
webdrivers (4.2.0)
200+
webdrivers (4.4.1)
201201
nokogiri (~> 1.6)
202202
rubyzip (>= 1.3.0)
203203
selenium-webdriver (>= 3.0, < 4.0)
204-
webpacker (4.2.2)
204+
webpacker (4.3.0)
205205
activesupport (>= 4.2)
206206
rack-proxy (>= 0.6.1)
207207
railties (>= 4.2)
208-
websocket-driver (0.7.1)
208+
websocket-driver (0.7.3)
209209
websocket-extensions (>= 0.1.0)
210-
websocket-extensions (0.1.4)
210+
websocket-extensions (0.1.5)
211211
xpath (3.2.0)
212212
nokogiri (~> 1.8)
213-
zeitwerk (2.2.2)
213+
zeitwerk (2.4.0)
214214

215215
PLATFORMS
216216
ruby
@@ -225,7 +225,7 @@ DEPENDENCIES
225225
jbuilder (~> 2.7)
226226
listen (>= 3.0.5, < 3.2)
227227
puma (~> 4.1)
228-
rails (~> 6.0.1)
228+
rails (~> 6.0.3.3)
229229
sass-rails (>= 6)
230230
selenium-webdriver
231231
spring
@@ -241,4 +241,4 @@ RUBY VERSION
241241
ruby 2.6.5p114
242242

243243
BUNDLED WITH
244-
2.0.2
244+
2.1.4

0 commit comments

Comments
 (0)