Skip to content

Commit 1cba325

Browse files
Merge pull request #394 from Shopify/update-activesupport
Update activesupport
2 parents 245e591 + e5bfcaa commit 1cba325

File tree

2 files changed

+25
-13
lines changed

2 files changed

+25
-13
lines changed

.github/workflows/test.yml

+6
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v4
12+
- uses: ruby/setup-ruby@v1
13+
with:
14+
ruby-version: ${{ matrix.ruby }}
15+
- name: Unlock Active Support
16+
run: bundle lock --update activesupport
17+
if: matrix.ruby == '3.1'
1218
- uses: ruby/setup-ruby@v1
1319
with:
1420
ruby-version: ${{ matrix.ruby }}

Gemfile.lock

+19-13
Original file line numberDiff line numberDiff line change
@@ -12,50 +12,54 @@ PATH
1212
GEM
1313
remote: https://rubygems.org/
1414
specs:
15-
actionview (7.1.3.2)
16-
activesupport (= 7.1.3.2)
15+
actionview (8.0.1)
16+
activesupport (= 8.0.1)
1717
builder (~> 3.1)
1818
erubi (~> 1.11)
1919
rails-dom-testing (~> 2.2)
2020
rails-html-sanitizer (~> 1.6)
21-
activesupport (7.1.3.2)
21+
activesupport (8.0.1)
2222
base64
23+
benchmark (>= 0.3)
2324
bigdecimal
24-
concurrent-ruby (~> 1.0, >= 1.0.2)
25+
concurrent-ruby (~> 1.0, >= 1.3.1)
2526
connection_pool (>= 2.2.5)
2627
drb
2728
i18n (>= 1.6, < 2)
29+
logger (>= 1.4.2)
2830
minitest (>= 5.1)
29-
mutex_m
30-
tzinfo (~> 2.0)
31+
securerandom (>= 0.3)
32+
tzinfo (~> 2.0, >= 2.0.5)
33+
uri (>= 0.13.1)
3134
ast (2.4.2)
3235
base64 (0.2.0)
36+
benchmark (0.4.0)
3337
better_html (2.1.1)
3438
actionview (>= 6.0)
3539
activesupport (>= 6.0)
3640
ast (~> 2.0)
3741
erubi (~> 1.4)
3842
parser (>= 2.4)
3943
smart_properties
40-
bigdecimal (3.1.7)
44+
bigdecimal (3.1.9)
4145
builder (3.2.4)
42-
concurrent-ruby (1.2.3)
43-
connection_pool (2.4.1)
46+
concurrent-ruby (1.3.4)
47+
connection_pool (2.5.0)
4448
crass (1.0.6)
4549
diff-lcs (1.5.0)
4650
drb (2.2.1)
4751
erubi (1.12.0)
4852
fakefs (1.5.1)
49-
i18n (1.14.4)
53+
i18n (1.14.6)
5054
concurrent-ruby (~> 1.0)
5155
json (2.9.1)
5256
language_server-protocol (3.17.0.3)
57+
logger (1.6.5)
5358
loofah (2.23.1)
5459
crass (~> 1.0.2)
5560
nokogiri (>= 1.12.0)
5661
mini_portile2 (2.8.8)
57-
minitest (5.22.3)
58-
mutex_m (0.2.0)
62+
minitest (5.25.4)
5963
nokogiri (1.15.7)
6064
mini_portile2 (~> 2.8.2)
6165
racc (~> 1.4)
@@ -102,12 +106,14 @@ GEM
102106
rubocop-shopify (2.15.1)
103107
rubocop (~> 1.51)
104108
ruby-progressbar (1.13.0)
109+
securerandom (0.4.1)
105110
smart_properties (1.17.0)
106111
tzinfo (2.0.6)
107112
concurrent-ruby (~> 1.0)
108113
unicode-display_width (3.1.3)
109114
unicode-emoji (~> 4.0, >= 4.0.4)
110115
unicode-emoji (4.0.4)
116+
uri (1.0.2)
111117

112118
PLATFORMS
113119
ruby
@@ -121,4 +127,4 @@ DEPENDENCIES
121127
rubocop-shopify
122128

123129
BUNDLED WITH
124-
2.4.20
130+
2.6.2

0 commit comments

Comments
 (0)