Skip to content

Commit

Permalink
fix the update CI by updating manually (#3865)
Browse files Browse the repository at this point in the history
Fix the update CI by updating manually and lock turbo-rails for ruby 2.7 compatibility.
  • Loading branch information
johrstrom authored Oct 14, 2024
1 parent 19a3c75 commit ab5ff97
Show file tree
Hide file tree
Showing 6 changed files with 3,222 additions and 59 deletions.
2 changes: 1 addition & 1 deletion apps/dashboard/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ end
gem 'nokogiri', '~> 1.15', '< 1.16'
gem 'net-imap', '~> 0.3', '< 0.4'
gem 'public_suffix', '~> 5.0', '< 6.0'
gem 'turbo-rails', '2.0.7'

# Extra third-party gems
gem 'dotenv-rails', '~> 2.1'
Expand All @@ -63,7 +64,6 @@ gem 'rest-client', '~> 2.0'

gem 'jsbundling-rails', '~> 1.0'
gem 'cssbundling-rails', '~> 1.1'
gem 'turbo-rails', '~> 2.0'

# should upgrade to propshaft - only have an issue with fontawesome icons
gem 'sprockets-rails', '>= 2.0.0'
Expand Down
16 changes: 9 additions & 7 deletions apps/dashboard/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,16 @@ GEM
http-accept (1.7.0)
http-cookie (1.0.7)
domain_name (~> 0.5)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
jbuilder (2.12.0)
jbuilder (2.13.0)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
jsbundling-rails (1.3.1)
railties (>= 6.0.0)
local_time (1.0.3)
coffee-rails
logger (1.6.1)
lograge (0.14.0)
actionpack (>= 4)
activesupport (>= 4)
Expand All @@ -143,9 +144,10 @@ GEM
marcel (1.0.4)
matrix (0.4.2)
method_source (1.1.0)
mime-types (3.5.2)
mime-types (3.6.0)
logger
mime-types-data (~> 3.2015)
mime-types-data (3.2024.0903)
mime-types-data (3.2024.1001)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitest (5.25.1)
Expand Down Expand Up @@ -232,7 +234,7 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.3.7)
rexml (3.3.8)
rss (0.3.1)
rexml
ruby2_keywords (0.0.5)
Expand Down Expand Up @@ -267,7 +269,7 @@ GEM
tilt (2.4.0)
timecop (0.9.10)
timeout (0.4.1)
turbo-rails (2.0.6)
turbo-rails (2.0.7)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
railties (>= 6.0.0)
Expand Down Expand Up @@ -320,7 +322,7 @@ DEPENDENCIES
sinatra-contrib
sprockets-rails (>= 2.0.0)
timecop (~> 0.9)
turbo-rails (~> 2.0)
turbo-rails (= 2.0.7)
webrick
zip_kit (~> 6.2)

Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"jquery-ujs": "^1.2.2",
"lodash": "^4.17.21",
"oboe": "^2.1.5",
"sass": "^1.50.0",
"sass": "1.78.0",
"sweetalert2": "10.16.9"
},
"scripts": {
Expand Down
32 changes: 16 additions & 16 deletions apps/dashboard/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
integrity sha512-8/SnIF9Q2k52mbjRVAYLranwkaDTLb+O9r4Z/uo8uNw//SjygKvvbF4BHSOuReufaAyum1q13602VcNud25Dfg==

"@types/jquery@^3.5.16":
version "3.5.30"
resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.30.tgz#888d584cbf844d3df56834b69925085038fd80f7"
integrity sha512-nbWKkkyb919DOUxjmRVk8vwtDb0/k8FKncmUKFi+NY+QXqWltooxTrswvz4LspQwxvLdvzBN1TImr6cw3aQx2A==
version "3.5.31"
resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.31.tgz#3605df86427f6c4e6b5b5a470ba180f74107cffa"
integrity sha512-rf/iB+cPJ/YZfMwr+FVuQbm7IaWC4y3FVYfVDxRGqmUCFjjPII0HWaP0vTPJGp6m4o13AXySCcMbWfrWtBFAKw==
dependencies:
"@types/sizzle" "*"

Expand All @@ -54,9 +54,9 @@
p-retry "^6.1.0"

"@uppy/core@^4.0":
version "4.2.0"
resolved "https://registry.yarnpkg.com/@uppy/core/-/core-4.2.0.tgz#215ce059dc7b1e7f08fe6f4a411b24b2495b120a"
integrity sha512-/oQ2m/xubGfANR0UfMqYFR2mT94OpuXTp9N2cQLIQmWYZtpvfX2gyNBFtQJA3Njqpmox1RfIhOAsVFFuhYVa+Q==
version "4.2.1"
resolved "https://registry.yarnpkg.com/@uppy/core/-/core-4.2.1.tgz#1b3cc54a89583a29c0f006657a08b397ac831937"
integrity sha512-5u6hoyESYbAswnSevo5mHnOQANqiEk1X3y4/JobmQEMdPJegbWgbZ0hpTx7zk/rBpEj5hr+xxNPF3LqqkC369g==
dependencies:
"@transloadit/prettier-bytes" "^0.3.4"
"@uppy/store-default" "^4.1.0"
Expand Down Expand Up @@ -136,9 +136,9 @@
preact "^10.5.13"

"@uppy/xhr-upload@^4.0":
version "4.1.0"
resolved "https://registry.yarnpkg.com/@uppy/xhr-upload/-/xhr-upload-4.1.0.tgz#df469be285c43d82ecd72e7a68e308ffe46f6f18"
integrity sha512-Q7ljGvAUCKaAUJaxo2Uqfe+Cdwol5PYgG4lESFHVPo+CE7FWavvEXoGefhJCyxqy+7ygp7lK6+tXHOGiYZXlJg==
version "4.2.0"
resolved "https://registry.yarnpkg.com/@uppy/xhr-upload/-/xhr-upload-4.2.0.tgz#1bcd632ef90568aa1b79874dd3fcffdd0a140bd2"
integrity sha512-MhpazjMEjFgEyB9Ewiz+ba4U3uZ6yBDrylBeMI0XSxJD5ZwygYBzqpacB6eoVZqHqyb9He90fdZnod5dD9Cc0g==
dependencies:
"@uppy/companion-client" "^4.1.0"
"@uppy/utils" "^6.0.2"
Expand Down Expand Up @@ -522,9 +522,9 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==

oboe@^2.1.5:
version "2.1.5"
resolved "https://registry.yarnpkg.com/oboe/-/oboe-2.1.5.tgz#5554284c543a2266d7a38f17e073821fbde393cd"
integrity sha512-zRFWiF+FoicxEs3jNI/WYUrVEgA7DeET/InK0XQuudGHRg8iIob3cNPrJTKaz4004uaA9Pbe+Dwa8iluhjLZWA==
version "2.1.7"
resolved "https://registry.yarnpkg.com/oboe/-/oboe-2.1.7.tgz#14cb69c750757a964c760383e094887822a32947"
integrity sha512-Y2oCMU2xgITORaNvIDCvUyn2ZG/5NI19lLjMFThgYzCH+GA/fgYvVcwxAqnZPiMiUrPq64jLzCkBXqKSu/R6MA==
dependencies:
http-https "^1.0.0"

Expand Down Expand Up @@ -556,9 +556,9 @@ picomatch@^2.0.4, picomatch@^2.2.1:
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==

preact@^10.5.13:
version "10.23.2"
resolved "https://registry.yarnpkg.com/preact/-/preact-10.23.2.tgz#52deec92796ae0f0cc6b034d9c66e0fbc1b837dc"
integrity sha512-kKYfePf9rzKnxOAKDpsWhg/ysrHPqT+yQ7UW4JjdnqjFIeNUnNcEJvhuA8fDenxAGWzUqtd51DfVg7xp/8T9NA==
version "10.24.2"
resolved "https://registry.yarnpkg.com/preact/-/preact-10.24.2.tgz#42179771d3b06e7adb884e3f8127ddd3d99b78f6"
integrity sha512-1cSoF0aCC8uaARATfrlz4VCBqE8LwZwRfLgkxJOQwAlQt6ayTmi0D9OF7nXid1POI5SZidFuG9CnlXbDfLqY/Q==

readdirp@~3.6.0:
version "3.6.0"
Expand All @@ -572,7 +572,7 @@ retry@^0.13.1:
resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==

sass@^1.50.0:
sass@1.78.0:
version "1.78.0"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.78.0.tgz#cef369b2f9dc21ea1d2cf22c979f52365da60841"
integrity sha512-AaIqGSrjo5lA2Yg7RvFZrlXDBCp3nV4XP73GrLGvdRWWwk+8H3l0SDvq/5bA4eF+0RFPLuWUk3E+P1U/YqnpsQ==
Expand Down
10 changes: 5 additions & 5 deletions apps/myjobs/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ GEM
sassc (>= 1.11)
globalid (1.2.1)
activesupport (>= 6.1)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
jbuilder (2.12.0)
jbuilder (2.13.0)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
jquery-datatables-rails (3.4.0)
Expand Down Expand Up @@ -216,7 +216,7 @@ GEM
redcarpet (3.6.0)
request_store (1.7.0)
rack (>= 1.4)
rexml (3.3.7)
rexml (3.3.8)
ruby2_keywords (0.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
Expand All @@ -233,7 +233,7 @@ GEM
ffi (~> 1.9)
sdoc (2.6.1)
rdoc (>= 5.0)
sprockets (3.7.3)
sprockets (3.7.5)
base64
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
Expand All @@ -248,7 +248,7 @@ GEM
timeout (0.4.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uglifier (4.2.0)
uglifier (4.2.1)
execjs (>= 0.3.0, < 3)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
Expand Down
Loading

0 comments on commit ab5ff97

Please sign in to comment.