Skip to content

Commit 2e0030f

Browse files
authored
Upgrade ruby, gems, and packages (#422)
1 parent a2f1ea3 commit 2e0030f

30 files changed

+1504
-1497
lines changed

.rubocop.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ plugins:
1111

1212
AllCops:
1313
NewCops: enable
14-
TargetRubyVersion: 3.4.1
14+
TargetRubyVersion: 3.4.2
1515

1616
FactoryBot/ExcessiveCreateList:
1717
Enabled: false

.tool-versions

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby 3.4.1
1+
ruby 3.4.2

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dist: focal
22
language: ruby
33
rvm:
4-
- 3.4.1
4+
- 3.4.2
55
cache: bundler
66
notifications:
77
email: false

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.4.1-slim
1+
FROM ruby:3.4.2-slim
22

33
ARG APP_NAME=phishin
44

Gemfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source "https://rubygems.org"
22
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
33

4-
ruby "3.4.1"
4+
ruby "3.4.2"
55

66
gem "actionpack-action_caching"
77
gem "chronic"
@@ -25,7 +25,7 @@ gem "puma"
2525
gem "pstore"
2626
gem "rack-cors"
2727
gem "rails"
28-
gem "react_on_rails", "14.0.5" # TODO: Update (fix stream package issue)
28+
gem "react_on_rails"
2929
gem "ruby-mp3info"
3030
gem "ruby-progressbar"
3131
gem "rubyzip"
@@ -35,7 +35,6 @@ gem "sidekiq"
3535
gem "sidekiq-scheduler"
3636
gem "sitemap_generator"
3737
gem "shakapacker"
38-
gem "slim"
3938
gem "sorcery"
4039
gem "typhoeus"
4140
gem "waveform"

Gemfile.lock

+65-70
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (8.0.1)
5-
actionpack (= 8.0.1)
6-
activesupport (= 8.0.1)
4+
actioncable (8.0.2)
5+
actionpack (= 8.0.2)
6+
activesupport (= 8.0.2)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
99
zeitwerk (~> 2.6)
10-
actionmailbox (8.0.1)
11-
actionpack (= 8.0.1)
12-
activejob (= 8.0.1)
13-
activerecord (= 8.0.1)
14-
activestorage (= 8.0.1)
15-
activesupport (= 8.0.1)
10+
actionmailbox (8.0.2)
11+
actionpack (= 8.0.2)
12+
activejob (= 8.0.2)
13+
activerecord (= 8.0.2)
14+
activestorage (= 8.0.2)
15+
activesupport (= 8.0.2)
1616
mail (>= 2.8.0)
17-
actionmailer (8.0.1)
18-
actionpack (= 8.0.1)
19-
actionview (= 8.0.1)
20-
activejob (= 8.0.1)
21-
activesupport (= 8.0.1)
17+
actionmailer (8.0.2)
18+
actionpack (= 8.0.2)
19+
actionview (= 8.0.2)
20+
activejob (= 8.0.2)
21+
activesupport (= 8.0.2)
2222
mail (>= 2.8.0)
2323
rails-dom-testing (~> 2.2)
24-
actionpack (8.0.1)
25-
actionview (= 8.0.1)
26-
activesupport (= 8.0.1)
24+
actionpack (8.0.2)
25+
actionview (= 8.0.2)
26+
activesupport (= 8.0.2)
2727
nokogiri (>= 1.8.5)
2828
rack (>= 2.2.4)
2929
rack-session (>= 1.0.1)
@@ -33,35 +33,35 @@ GEM
3333
useragent (~> 0.16)
3434
actionpack-action_caching (1.2.2)
3535
actionpack (>= 4.0.0)
36-
actiontext (8.0.1)
37-
actionpack (= 8.0.1)
38-
activerecord (= 8.0.1)
39-
activestorage (= 8.0.1)
40-
activesupport (= 8.0.1)
36+
actiontext (8.0.2)
37+
actionpack (= 8.0.2)
38+
activerecord (= 8.0.2)
39+
activestorage (= 8.0.2)
40+
activesupport (= 8.0.2)
4141
globalid (>= 0.6.0)
4242
nokogiri (>= 1.8.5)
43-
actionview (8.0.1)
44-
activesupport (= 8.0.1)
43+
actionview (8.0.2)
44+
activesupport (= 8.0.2)
4545
builder (~> 3.1)
4646
erubi (~> 1.11)
4747
rails-dom-testing (~> 2.2)
4848
rails-html-sanitizer (~> 1.6)
49-
activejob (8.0.1)
50-
activesupport (= 8.0.1)
49+
activejob (8.0.2)
50+
activesupport (= 8.0.2)
5151
globalid (>= 0.3.6)
52-
activemodel (8.0.1)
53-
activesupport (= 8.0.1)
54-
activerecord (8.0.1)
55-
activemodel (= 8.0.1)
56-
activesupport (= 8.0.1)
52+
activemodel (8.0.2)
53+
activesupport (= 8.0.2)
54+
activerecord (8.0.2)
55+
activemodel (= 8.0.2)
56+
activesupport (= 8.0.2)
5757
timeout (>= 0.4.0)
58-
activestorage (8.0.1)
59-
actionpack (= 8.0.1)
60-
activejob (= 8.0.1)
61-
activerecord (= 8.0.1)
62-
activesupport (= 8.0.1)
58+
activestorage (8.0.2)
59+
actionpack (= 8.0.2)
60+
activejob (= 8.0.2)
61+
activerecord (= 8.0.2)
62+
activesupport (= 8.0.2)
6363
marcel (~> 1.0)
64-
activesupport (8.0.1)
64+
activesupport (8.0.2)
6565
base64
6666
benchmark (>= 0.3)
6767
bigdecimal
@@ -226,7 +226,7 @@ GEM
226226
pp (>= 0.6.0)
227227
rdoc (>= 4.0.0)
228228
reline (>= 0.4.2)
229-
json (2.10.1)
229+
json (2.10.2)
230230
jwt (2.10.1)
231231
base64
232232
language_server-protocol (3.17.0.4)
@@ -250,7 +250,7 @@ GEM
250250
benchmark
251251
logger
252252
mini_mime (1.1.5)
253-
minitest (5.25.4)
253+
minitest (5.25.5)
254254
multi_json (1.15.0)
255255
multi_xml (0.7.1)
256256
bigdecimal (~> 3.1)
@@ -300,7 +300,7 @@ GEM
300300
pp (0.6.2)
301301
prettyprint
302302
prettyprint (0.2.0)
303-
pstore (0.1.4)
303+
pstore (0.2.0)
304304
psych (5.2.3)
305305
date
306306
stringio
@@ -321,30 +321,30 @@ GEM
321321
rack (>= 1.3)
322322
rackup (2.2.1)
323323
rack (>= 3)
324-
rails (8.0.1)
325-
actioncable (= 8.0.1)
326-
actionmailbox (= 8.0.1)
327-
actionmailer (= 8.0.1)
328-
actionpack (= 8.0.1)
329-
actiontext (= 8.0.1)
330-
actionview (= 8.0.1)
331-
activejob (= 8.0.1)
332-
activemodel (= 8.0.1)
333-
activerecord (= 8.0.1)
334-
activestorage (= 8.0.1)
335-
activesupport (= 8.0.1)
324+
rails (8.0.2)
325+
actioncable (= 8.0.2)
326+
actionmailbox (= 8.0.2)
327+
actionmailer (= 8.0.2)
328+
actionpack (= 8.0.2)
329+
actiontext (= 8.0.2)
330+
actionview (= 8.0.2)
331+
activejob (= 8.0.2)
332+
activemodel (= 8.0.2)
333+
activerecord (= 8.0.2)
334+
activestorage (= 8.0.2)
335+
activesupport (= 8.0.2)
336336
bundler (>= 1.15.0)
337-
railties (= 8.0.1)
337+
railties (= 8.0.2)
338338
rails-dom-testing (2.2.0)
339339
activesupport (>= 5.0.0)
340340
minitest
341341
nokogiri (>= 1.6)
342342
rails-html-sanitizer (1.6.2)
343343
loofah (~> 2.21)
344344
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
345-
railties (8.0.1)
346-
actionpack (= 8.0.1)
347-
activesupport (= 8.0.1)
345+
railties (8.0.2)
346+
actionpack (= 8.0.2)
347+
activesupport (= 8.0.2)
348348
irb (~> 1.13)
349349
rackup (>= 1.0.0)
350350
rake (>= 12.2)
@@ -354,7 +354,7 @@ GEM
354354
rake (13.2.1)
355355
rdoc (6.12.0)
356356
psych (>= 4.0.0)
357-
react_on_rails (14.0.5)
357+
react_on_rails (14.2.0)
358358
addressable
359359
connection_pool
360360
execjs (~> 2.5)
@@ -401,10 +401,10 @@ GEM
401401
unicode-display_width (>= 2.4.0, < 4.0)
402402
rubocop-ast (1.38.1)
403403
parser (>= 3.3.1.0)
404-
rubocop-capybara (2.22.0)
404+
rubocop-capybara (2.22.1)
405405
lint_roller (~> 1.1)
406406
rubocop (~> 1.72, >= 1.72.1)
407-
rubocop-factory_bot (2.27.0)
407+
rubocop-factory_bot (2.27.1)
408408
lint_roller (~> 1.1)
409409
rubocop (~> 1.72, >= 1.72.1)
410410
rubocop-performance (1.24.0)
@@ -449,10 +449,10 @@ GEM
449449
rubyzip (>= 1.2.2, < 3.0)
450450
websocket (~> 1.0)
451451
semantic_range (3.1.0)
452-
sentry-rails (5.22.4)
452+
sentry-rails (5.23.0)
453453
railties (>= 5.0)
454-
sentry-ruby (~> 5.22.4)
455-
sentry-ruby (5.22.4)
454+
sentry-ruby (~> 5.23.0)
455+
sentry-ruby (5.23.0)
456456
bigdecimal
457457
concurrent-ruby (~> 1.0, >= 1.0.2)
458458
shakapacker (8.1.0)
@@ -486,9 +486,6 @@ GEM
486486
simplecov_json_formatter (0.1.4)
487487
sitemap_generator (6.3.0)
488488
builder (~> 3.0)
489-
slim (5.2.1)
490-
temple (~> 0.10.0)
491-
tilt (>= 2.1.0)
492489
snaky_hash (2.0.1)
493490
hashie
494491
version_gem (~> 1.1, >= 1.1.1)
@@ -497,7 +494,6 @@ GEM
497494
oauth (>= 0.6)
498495
oauth2 (~> 2.0)
499496
stringio (3.1.5)
500-
temple (0.10.3)
501497
thor (1.3.2)
502498
tilt (2.6.0)
503499
timeout (0.4.3)
@@ -560,7 +556,7 @@ DEPENDENCIES
560556
puma
561557
rack-cors
562558
rails
563-
react_on_rails (= 14.0.5)
559+
react_on_rails
564560
rspec-rails
565561
rubocop
566562
rubocop-capybara
@@ -582,14 +578,13 @@ DEPENDENCIES
582578
sidekiq-scheduler
583579
simplecov
584580
sitemap_generator
585-
slim
586581
sorcery
587582
typhoeus
588583
waveform
589584
will_paginate
590585

591586
RUBY VERSION
592-
ruby 3.4.1p0
587+
ruby 3.4.2p28
593588

594589
BUNDLED WITH
595-
2.6.2
590+
2.6.5

app/javascript/packs/application.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Images and CSS
22
const images = require.context('../images', true)
33
const imagePath = (name) => images(name, true)
4-
import "../stylesheets/application.css.scss";
4+
import "../stylesheets/application.scss";
55

66
// React on Rails app
77
import ReactOnRails from "react-on-rails";

app/javascript/stylesheets/bulma-overrides.css.scss app/javascript/stylesheets/_bulma-overrides.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "./variables" as *;
2+
13
.dropdown-menu {
24
z-index: 101; /* Higher than audio player */
35
}

app/javascript/stylesheets/content.css.scss app/javascript/stylesheets/_content.scss

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "./variables" as *;
2+
13
main {
24
flex: 1;
35
}
@@ -20,7 +22,7 @@ main {
2022
}
2123

2224
#sidebar {
23-
background-color: rgba($header-gray, 0.7);
25+
background-color: $navbar-gray;
2426
padding: 1rem;
2527
flex: 0 0 16rem;
2628
border-radius: $radius;
@@ -391,7 +393,7 @@ main {
391393
left: 1rem;
392394
right: 1rem;
393395
height: 1px;
394-
background-color: rgba($header-gray, 0.7);
396+
background-color: $navbar-gray;
395397
}
396398

397399
&:first-of-type {
@@ -645,7 +647,7 @@ main {
645647
width: 100%;
646648
flex: none !important;
647649
padding: 0.3rem;
648-
background-color: rgba($header-gray, 0.7);
650+
background-color: $navbar-gray;
649651

650652
.sidebar-content {
651653
display: flex;
File renamed without changes.

app/javascript/stylesheets/errors.css.scss app/javascript/stylesheets/_errors.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "./variables" as *;
2+
13
.error-page {
24
display: flex;
35
flex-direction: column;

app/javascript/stylesheets/feedback.css.scss app/javascript/stylesheets/_feedback.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "./variables" as *;
2+
13
.close-btn {
24
float: right;
35
font-size: 1rem;

app/javascript/stylesheets/likes.css.scss app/javascript/stylesheets/_likes.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "./variables" as *;
2+
13
.like-container {
24
display: flex;
35
align-items: center;

app/javascript/stylesheets/map.css.scss app/javascript/stylesheets/_map.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "./variables" as *;
2+
13
.map-container {
24
border-radius: $radius;
35
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15);

app/javascript/stylesheets/mobile.css.scss app/javascript/stylesheets/_mobile.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "./variables" as *;
2+
13
.mobile-show-wrapper {
24
display: flex;
35
justify-content: center;

app/javascript/stylesheets/modal.css.scss app/javascript/stylesheets/_modal.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "./variables" as *;
2+
13
.modal-content {
24
background: white;
35
padding: 1.5rem;

0 commit comments

Comments
 (0)