Skip to content

Commit 2b9da4e

Browse files
doerflidoerfli
authored
Merge pull request #347 from doerfli/combine-prs-branch
Combined PR
2 parents e9e7740 + 589a9bf commit 2b9da4e

File tree

4 files changed

+83
-83
lines changed

4 files changed

+83
-83
lines changed

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ruby File.read(".ruby-version").strip
55
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
66

77
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
8-
gem 'rails', '~> 7.0.4'
8+
gem 'rails', '~> 7.0.6'
99
# Use postgresql as the database for Active Record
1010
gem 'pg', '>= 0.18'
1111
# Use Puma as the app server

‎Gemfile.lock‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (7.0.4.3)
5-
actionpack (= 7.0.4.3)
6-
activesupport (= 7.0.4.3)
4+
actioncable (7.0.6)
5+
actionpack (= 7.0.6)
6+
activesupport (= 7.0.6)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
9-
actionmailbox (7.0.4.3)
10-
actionpack (= 7.0.4.3)
11-
activejob (= 7.0.4.3)
12-
activerecord (= 7.0.4.3)
13-
activestorage (= 7.0.4.3)
14-
activesupport (= 7.0.4.3)
9+
actionmailbox (7.0.6)
10+
actionpack (= 7.0.6)
11+
activejob (= 7.0.6)
12+
activerecord (= 7.0.6)
13+
activestorage (= 7.0.6)
14+
activesupport (= 7.0.6)
1515
mail (>= 2.7.1)
1616
net-imap
1717
net-pop
1818
net-smtp
19-
actionmailer (7.0.4.3)
20-
actionpack (= 7.0.4.3)
21-
actionview (= 7.0.4.3)
22-
activejob (= 7.0.4.3)
23-
activesupport (= 7.0.4.3)
19+
actionmailer (7.0.6)
20+
actionpack (= 7.0.6)
21+
actionview (= 7.0.6)
22+
activejob (= 7.0.6)
23+
activesupport (= 7.0.6)
2424
mail (~> 2.5, >= 2.5.4)
2525
net-imap
2626
net-pop
2727
net-smtp
2828
rails-dom-testing (~> 2.0)
29-
actionpack (7.0.4.3)
30-
actionview (= 7.0.4.3)
31-
activesupport (= 7.0.4.3)
32-
rack (~> 2.0, >= 2.2.0)
29+
actionpack (7.0.6)
30+
actionview (= 7.0.6)
31+
activesupport (= 7.0.6)
32+
rack (~> 2.0, >= 2.2.4)
3333
rack-test (>= 0.6.3)
3434
rails-dom-testing (~> 2.0)
3535
rails-html-sanitizer (~> 1.0, >= 1.2.0)
36-
actiontext (7.0.4.3)
37-
actionpack (= 7.0.4.3)
38-
activerecord (= 7.0.4.3)
39-
activestorage (= 7.0.4.3)
40-
activesupport (= 7.0.4.3)
36+
actiontext (7.0.6)
37+
actionpack (= 7.0.6)
38+
activerecord (= 7.0.6)
39+
activestorage (= 7.0.6)
40+
activesupport (= 7.0.6)
4141
globalid (>= 0.6.0)
4242
nokogiri (>= 1.8.5)
43-
actionview (7.0.4.3)
44-
activesupport (= 7.0.4.3)
43+
actionview (7.0.6)
44+
activesupport (= 7.0.6)
4545
builder (~> 3.1)
4646
erubi (~> 1.4)
4747
rails-dom-testing (~> 2.0)
4848
rails-html-sanitizer (~> 1.1, >= 1.2.0)
49-
activejob (7.0.4.3)
50-
activesupport (= 7.0.4.3)
49+
activejob (7.0.6)
50+
activesupport (= 7.0.6)
5151
globalid (>= 0.3.6)
52-
activemodel (7.0.4.3)
53-
activesupport (= 7.0.4.3)
54-
activerecord (7.0.4.3)
55-
activemodel (= 7.0.4.3)
56-
activesupport (= 7.0.4.3)
57-
activestorage (7.0.4.3)
58-
actionpack (= 7.0.4.3)
59-
activejob (= 7.0.4.3)
60-
activerecord (= 7.0.4.3)
61-
activesupport (= 7.0.4.3)
52+
activemodel (7.0.6)
53+
activesupport (= 7.0.6)
54+
activerecord (7.0.6)
55+
activemodel (= 7.0.6)
56+
activesupport (= 7.0.6)
57+
activestorage (7.0.6)
58+
actionpack (= 7.0.6)
59+
activejob (= 7.0.6)
60+
activerecord (= 7.0.6)
61+
activesupport (= 7.0.6)
6262
marcel (~> 1.0)
6363
mini_mime (>= 1.1.0)
64-
activesupport (7.0.4.3)
64+
activesupport (7.0.6)
6565
concurrent-ruby (~> 1.0, >= 1.0.2)
6666
i18n (>= 1.6, < 2)
6767
minitest (>= 5.1)
@@ -206,7 +206,7 @@ GEM
206206
minitest (5.18.1)
207207
msgpack (1.6.0)
208208
multi_xml (0.6.0)
209-
net-imap (0.3.4)
209+
net-imap (0.3.6)
210210
date
211211
net-protocol
212212
net-pop (0.1.2)
@@ -254,30 +254,30 @@ GEM
254254
rack
255255
rack-test (2.1.0)
256256
rack (>= 1.3)
257-
rails (7.0.4.3)
258-
actioncable (= 7.0.4.3)
259-
actionmailbox (= 7.0.4.3)
260-
actionmailer (= 7.0.4.3)
261-
actionpack (= 7.0.4.3)
262-
actiontext (= 7.0.4.3)
263-
actionview (= 7.0.4.3)
264-
activejob (= 7.0.4.3)
265-
activemodel (= 7.0.4.3)
266-
activerecord (= 7.0.4.3)
267-
activestorage (= 7.0.4.3)
268-
activesupport (= 7.0.4.3)
257+
rails (7.0.6)
258+
actioncable (= 7.0.6)
259+
actionmailbox (= 7.0.6)
260+
actionmailer (= 7.0.6)
261+
actionpack (= 7.0.6)
262+
actiontext (= 7.0.6)
263+
actionview (= 7.0.6)
264+
activejob (= 7.0.6)
265+
activemodel (= 7.0.6)
266+
activerecord (= 7.0.6)
267+
activestorage (= 7.0.6)
268+
activesupport (= 7.0.6)
269269
bundler (>= 1.15.0)
270-
railties (= 7.0.4.3)
270+
railties (= 7.0.6)
271271
rails-dom-testing (2.1.1)
272272
activesupport (>= 5.0.0)
273273
minitest
274274
nokogiri (>= 1.6)
275275
rails-html-sanitizer (1.6.0)
276276
loofah (~> 2.21)
277277
nokogiri (~> 1.14)
278-
railties (7.0.4.3)
279-
actionpack (= 7.0.4.3)
280-
activesupport (= 7.0.4.3)
278+
railties (7.0.6)
279+
actionpack (= 7.0.6)
280+
activesupport (= 7.0.6)
281281
method_source
282282
rake (>= 12.2)
283283
thor (~> 1.0)
@@ -366,7 +366,7 @@ GEM
366366
sprockets (>= 3.0.0)
367367
thor (1.2.2)
368368
tilt (2.1.0)
369-
timeout (0.3.2)
369+
timeout (0.4.0)
370370
turbolinks (5.2.1)
371371
turbolinks-source (~> 5.2)
372372
turbolinks-source (5.2.0)
@@ -418,7 +418,7 @@ DEPENDENCIES
418418
pg (>= 0.18)
419419
puma (~> 6.3)
420420
rack-mini-profiler
421-
rails (~> 7.0.4)
421+
rails (~> 7.0.6)
422422
rspec-rails
423423
rtesseract (~> 3.1)
424424
selenium-webdriver

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"@hotwired/stimulus": "^3.2.1",
77
"@hotwired/stimulus-webpack-helpers": "^1.0.1",
88
"@rails/actiontext": "^7.0.6",
9-
"@rails/activestorage": "^7.0.4",
9+
"@rails/activestorage": "^7.0.6",
1010
"@rails/ujs": "^7.0.6",
1111
"@tailwindcss/forms": "^0.5.3",
1212
"@tailwindcss/typography": "^0.5.9",
@@ -24,7 +24,7 @@
2424
"devDependencies": {
2525
"copyfiles": "^2.4.1",
2626
"webpack": "^5.88.1",
27-
"webpack-cli": "^5.0.2"
27+
"webpack-cli": "^5.1.4"
2828
},
2929
"scripts": {
3030
"build:css": "copyfiles -f node_modules/@fortawesome/fontawesome-free/webfonts/* public/webfonts && postcss ./app/assets/stylesheets/application.postcss.css -o ./app/assets/builds/application.css",

‎yarn.lock‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,10 @@
117117
dependencies:
118118
"@rails/activestorage" ">= 7.0.0-alpha1"
119119

120-
"@rails/activestorage@>= 7.0.0-alpha1", "@rails/activestorage@^7.0.4":
121-
version "7.0.4"
122-
resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-7.0.4.tgz#56bc3052f60e8867b40a87ed5ff3c0afe536643e"
123-
integrity sha512-K2fV9C0z88fapu58nt9uHzMylsmJWUFuaIFvuZQEf1WTiPMsgTsj1bf8+cD81zXfTXYMZDQNRq4164JmuBKD3A==
120+
"@rails/activestorage@>= 7.0.0-alpha1", "@rails/activestorage@^7.0.6":
121+
version "7.0.6"
122+
resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-7.0.6.tgz#8b762e7142eb8332541dffa0f841d7a5026f64fd"
123+
integrity sha512-sLr5Uj8cnWkX9lLV7wk8mIVFt6XFOJR7mAXm0QmDnrR/YGMF4Ho5tcVRUHzlyAisRQcHp6D0zHSVgOUukF8OHg==
124124
dependencies:
125125
spark-md5 "^3.0.1"
126126

@@ -298,20 +298,20 @@
298298
"@webassemblyjs/ast" "1.11.6"
299299
"@xtuc/long" "4.2.2"
300300

301-
"@webpack-cli/configtest@^2.0.1":
302-
version "2.0.1"
303-
resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.1.tgz#a69720f6c9bad6aef54a8fa6ba9c3533e7ef4c7f"
304-
integrity sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==
305-
306-
"@webpack-cli/info@^2.0.1":
307-
version "2.0.1"
308-
resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz#eed745799c910d20081e06e5177c2b2569f166c0"
309-
integrity sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==
301+
"@webpack-cli/configtest@^2.1.1":
302+
version "2.1.1"
303+
resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646"
304+
integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==
310305

311-
"@webpack-cli/serve@^2.0.2":
306+
"@webpack-cli/info@^2.0.2":
312307
version "2.0.2"
313-
resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.2.tgz#10aa290e44a182c02e173a89452781b1acbc86d9"
314-
integrity sha512-S9h3GmOmzUseyeFW3tYNnWS7gNUuwxZ3mmMq0JyW78Vx1SGKPSkt5bT4pB0rUnVfHjP0EL9gW2bOzmtiTfQt0A==
308+
resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd"
309+
integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==
310+
311+
"@webpack-cli/serve@^2.0.5":
312+
version "2.0.5"
313+
resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e"
314+
integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==
315315

316316
"@xtuc/ieee754@^1.2.0":
317317
version "1.2.0"
@@ -1632,15 +1632,15 @@ watchpack@^2.4.0:
16321632
glob-to-regexp "^0.4.1"
16331633
graceful-fs "^4.1.2"
16341634

1635-
webpack-cli@^5.0.2:
1636-
version "5.0.2"
1637-
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.2.tgz#2954c10ecb61c5d4dad6f68ee2d77f051741946c"
1638-
integrity sha512-4y3W5Dawri5+8dXm3+diW6Mn1Ya+Dei6eEVAdIduAmYNLzv1koKVAqsfgrrc9P2mhrYHQphx5htnGkcNwtubyQ==
1635+
webpack-cli@^5.1.4:
1636+
version "5.1.4"
1637+
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b"
1638+
integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==
16391639
dependencies:
16401640
"@discoveryjs/json-ext" "^0.5.0"
1641-
"@webpack-cli/configtest" "^2.0.1"
1642-
"@webpack-cli/info" "^2.0.1"
1643-
"@webpack-cli/serve" "^2.0.2"
1641+
"@webpack-cli/configtest" "^2.1.1"
1642+
"@webpack-cli/info" "^2.0.2"
1643+
"@webpack-cli/serve" "^2.0.5"
16441644
colorette "^2.0.14"
16451645
commander "^10.0.1"
16461646
cross-spawn "^7.0.3"

0 commit comments

Comments
 (0)