Skip to content

Commit 03a10e9

Browse files
authored
Merge pull request #1324 from Shopify/only-upgrade-rails
Upgrade Rails to 7.1.1
2 parents 7018749 + 5550402 commit 03a10e9

File tree

11 files changed

+137
-106
lines changed

11 files changed

+137
-106
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ jobs:
150150
export SHIPIT_GEM_PATH="${PWD}"
151151
mkdir /tmp/new-app
152152
cd /tmp/new-app
153-
gem install rails -v '~> 7.0.2' --no-document
153+
gem install rails -v '~> 7.1.1' --no-document
154154
rails new shipit --skip-action-cable --skip-turbolinks --skip-action-mailer --skip-active-storage --skip-webpack-install --skip-action-mailbox --skip-action-text -m "${SHIPIT_GEM_PATH}/template.rb"
155155
env:
156156
SHIPIT_EDGE: "1"

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Unreleased
22

3+
* Upgraded to Rails 7.1.1
4+
35
# 0.38.0
46

57
* Convert `commit_deployment_statuses.github_id` to bigint (#1312)

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,4 @@ end
2525
group :development, :test do
2626
gem 'byebug'
2727
gem 'pry'
28-
gem 'mini_racer'
2928
end

Gemfile.lock

Lines changed: 119 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ PATH
1616
omniauth-github (~> 1.4)
1717
paquito
1818
pubsubstub (~> 0.2.0)
19-
rails (~> 7.0.0)
19+
rails (~> 7.1.1)
2020
rails-timeago (~> 2.13.0)
2121
rails_autolink (~> 1.1.6)
2222
rake
@@ -33,73 +33,81 @@ PATH
3333
GEM
3434
remote: https://rubygems.org/
3535
specs:
36-
actioncable (7.0.7.2)
37-
actionpack (= 7.0.7.2)
38-
activesupport (= 7.0.7.2)
36+
actioncable (7.1.1)
37+
actionpack (= 7.1.1)
38+
activesupport (= 7.1.1)
3939
nio4r (~> 2.0)
4040
websocket-driver (>= 0.6.1)
41-
actionmailbox (7.0.7.2)
42-
actionpack (= 7.0.7.2)
43-
activejob (= 7.0.7.2)
44-
activerecord (= 7.0.7.2)
45-
activestorage (= 7.0.7.2)
46-
activesupport (= 7.0.7.2)
41+
zeitwerk (~> 2.6)
42+
actionmailbox (7.1.1)
43+
actionpack (= 7.1.1)
44+
activejob (= 7.1.1)
45+
activerecord (= 7.1.1)
46+
activestorage (= 7.1.1)
47+
activesupport (= 7.1.1)
4748
mail (>= 2.7.1)
4849
net-imap
4950
net-pop
5051
net-smtp
51-
actionmailer (7.0.7.2)
52-
actionpack (= 7.0.7.2)
53-
actionview (= 7.0.7.2)
54-
activejob (= 7.0.7.2)
55-
activesupport (= 7.0.7.2)
52+
actionmailer (7.1.1)
53+
actionpack (= 7.1.1)
54+
actionview (= 7.1.1)
55+
activejob (= 7.1.1)
56+
activesupport (= 7.1.1)
5657
mail (~> 2.5, >= 2.5.4)
5758
net-imap
5859
net-pop
5960
net-smtp
60-
rails-dom-testing (~> 2.0)
61-
actionpack (7.0.7.2)
62-
actionview (= 7.0.7.2)
63-
activesupport (= 7.0.7.2)
64-
rack (~> 2.0, >= 2.2.4)
61+
rails-dom-testing (~> 2.2)
62+
actionpack (7.1.1)
63+
actionview (= 7.1.1)
64+
activesupport (= 7.1.1)
65+
nokogiri (>= 1.8.5)
66+
rack (>= 2.2.4)
67+
rack-session (>= 1.0.1)
6568
rack-test (>= 0.6.3)
66-
rails-dom-testing (~> 2.0)
67-
rails-html-sanitizer (~> 1.0, >= 1.2.0)
68-
actiontext (7.0.7.2)
69-
actionpack (= 7.0.7.2)
70-
activerecord (= 7.0.7.2)
71-
activestorage (= 7.0.7.2)
72-
activesupport (= 7.0.7.2)
69+
rails-dom-testing (~> 2.2)
70+
rails-html-sanitizer (~> 1.6)
71+
actiontext (7.1.1)
72+
actionpack (= 7.1.1)
73+
activerecord (= 7.1.1)
74+
activestorage (= 7.1.1)
75+
activesupport (= 7.1.1)
7376
globalid (>= 0.6.0)
7477
nokogiri (>= 1.8.5)
75-
actionview (7.0.7.2)
76-
activesupport (= 7.0.7.2)
78+
actionview (7.1.1)
79+
activesupport (= 7.1.1)
7780
builder (~> 3.1)
78-
erubi (~> 1.4)
79-
rails-dom-testing (~> 2.0)
80-
rails-html-sanitizer (~> 1.1, >= 1.2.0)
81+
erubi (~> 1.11)
82+
rails-dom-testing (~> 2.2)
83+
rails-html-sanitizer (~> 1.6)
8184
active_model_serializers (0.9.9)
8285
activemodel (>= 3.2)
8386
concurrent-ruby (~> 1.0)
84-
activejob (7.0.7.2)
85-
activesupport (= 7.0.7.2)
87+
activejob (7.1.1)
88+
activesupport (= 7.1.1)
8689
globalid (>= 0.3.6)
87-
activemodel (7.0.7.2)
88-
activesupport (= 7.0.7.2)
89-
activerecord (7.0.7.2)
90-
activemodel (= 7.0.7.2)
91-
activesupport (= 7.0.7.2)
92-
activestorage (7.0.7.2)
93-
actionpack (= 7.0.7.2)
94-
activejob (= 7.0.7.2)
95-
activerecord (= 7.0.7.2)
96-
activesupport (= 7.0.7.2)
90+
activemodel (7.1.1)
91+
activesupport (= 7.1.1)
92+
activerecord (7.1.1)
93+
activemodel (= 7.1.1)
94+
activesupport (= 7.1.1)
95+
timeout (>= 0.4.0)
96+
activestorage (7.1.1)
97+
actionpack (= 7.1.1)
98+
activejob (= 7.1.1)
99+
activerecord (= 7.1.1)
100+
activesupport (= 7.1.1)
97101
marcel (~> 1.0)
98-
mini_mime (>= 1.1.0)
99-
activesupport (7.0.7.2)
102+
activesupport (7.1.1)
103+
base64
104+
bigdecimal
100105
concurrent-ruby (~> 1.0, >= 1.0.2)
106+
connection_pool (>= 2.2.5)
107+
drb
101108
i18n (>= 1.6, < 2)
102109
minitest (>= 5.1)
110+
mutex_m
103111
tzinfo (~> 2.0)
104112
addressable (2.8.0)
105113
public_suffix (>= 2.0.2, < 5.0)
@@ -111,6 +119,8 @@ GEM
111119
descendants_tracker (~> 0.0.4)
112120
ice_nine (~> 0.11.0)
113121
thread_safe (~> 0.3, >= 0.3.1)
122+
base64 (0.2.0)
123+
bigdecimal (3.1.6)
114124
builder (3.2.4)
115125
byebug (11.1.3)
116126
coderay (1.1.3)
@@ -123,14 +133,17 @@ GEM
123133
coffee-script-source
124134
execjs
125135
coffee-script-source (1.12.2)
126-
concurrent-ruby (1.2.2)
136+
concurrent-ruby (1.2.3)
137+
connection_pool (2.4.1)
127138
crack (0.4.5)
128139
rexml
129140
crass (1.0.6)
130-
date (3.3.3)
141+
date (3.3.4)
131142
descendants_tracker (0.0.4)
132143
thread_safe (~> 0.3, >= 0.3.1)
133144
docile (1.4.0)
145+
drb (2.2.0)
146+
ruby2_keywords
134147
equalizer (0.0.11)
135148
erubi (1.12.0)
136149
execjs (2.8.1)
@@ -167,24 +180,25 @@ GEM
167180
faraday-retry (1.0.3)
168181
ffi (1.15.5)
169182
gemoji (2.1.0)
170-
globalid (1.1.0)
171-
activesupport (>= 5.0)
183+
globalid (1.2.1)
184+
activesupport (>= 6.1)
172185
hashdiff (1.0.1)
173186
hashie (5.0.0)
174187
i18n (1.14.1)
175188
concurrent-ruby (~> 1.0)
176189
ice_nine (0.11.2)
190+
io-console (0.7.2)
191+
irb (1.11.1)
192+
rdoc
193+
reline (>= 0.4.2)
177194
jquery-rails (4.6.0)
178195
rails-dom-testing (>= 1, < 3)
179196
railties (>= 4.2.0)
180197
thor (>= 0.14, < 2.0)
181198
jwt (2.7.1)
182-
libv8-node (16.10.0.0-arm64-darwin)
183-
libv8-node (16.10.0.0-x86_64-darwin)
184-
libv8-node (16.10.0.0-x86_64-linux)
185199
lodash-rails (4.17.21)
186200
railties (>= 3.1)
187-
loofah (2.21.3)
201+
loofah (2.22.0)
188202
crass (~> 1.0.2)
189203
nokogiri (>= 1.12.0)
190204
mail (2.8.1)
@@ -194,31 +208,30 @@ GEM
194208
net-smtp
195209
marcel (1.0.2)
196210
method_source (1.0.0)
197-
mini_mime (1.1.2)
198-
mini_racer (0.6.2)
199-
libv8-node (~> 16.10.0.0)
200-
minitest (5.19.0)
211+
mini_mime (1.1.5)
212+
minitest (5.21.2)
201213
mocha (2.1.0)
202214
ruby2_keywords (>= 0.0.5)
203215
msgpack (1.7.1)
204216
multi_xml (0.6.0)
205217
multipart-post (2.3.0)
218+
mutex_m (0.2.0)
206219
mysql2 (0.5.3)
207-
net-imap (0.3.6)
220+
net-imap (0.4.9.1)
208221
date
209222
net-protocol
210223
net-pop (0.1.2)
211224
net-protocol
212-
net-protocol (0.2.1)
225+
net-protocol (0.2.2)
213226
timeout
214-
net-smtp (0.3.3)
227+
net-smtp (0.4.0.1)
215228
net-protocol
216-
nio4r (2.5.9)
217-
nokogiri (1.15.2-arm64-darwin)
229+
nio4r (2.7.0)
230+
nokogiri (1.15.5-arm64-darwin)
218231
racc (~> 1.4)
219-
nokogiri (1.15.2-x86_64-darwin)
232+
nokogiri (1.15.5-x86_64-darwin)
220233
racc (~> 1.4)
221-
nokogiri (1.15.2-x86_64-linux)
234+
nokogiri (1.15.5-x86_64-linux)
222235
racc (~> 1.4)
223236
oauth2 (2.0.9)
224237
faraday (>= 0.17.3, < 3.0)
@@ -248,29 +261,36 @@ GEM
248261
pry (0.14.1)
249262
coderay (~> 1.1)
250263
method_source (~> 1.0)
264+
psych (5.1.2)
265+
stringio
251266
public_suffix (4.0.6)
252267
pubsubstub (0.2.2)
253268
rack
254269
redis (~> 4.0)
255-
racc (1.7.1)
256-
rack (2.2.7)
270+
racc (1.7.3)
271+
rack (2.2.8)
272+
rack-session (1.0.2)
273+
rack (< 3)
257274
rack-test (2.1.0)
258275
rack (>= 1.3)
259-
rails (7.0.7.2)
260-
actioncable (= 7.0.7.2)
261-
actionmailbox (= 7.0.7.2)
262-
actionmailer (= 7.0.7.2)
263-
actionpack (= 7.0.7.2)
264-
actiontext (= 7.0.7.2)
265-
actionview (= 7.0.7.2)
266-
activejob (= 7.0.7.2)
267-
activemodel (= 7.0.7.2)
268-
activerecord (= 7.0.7.2)
269-
activestorage (= 7.0.7.2)
270-
activesupport (= 7.0.7.2)
276+
rackup (1.0.0)
277+
rack (< 3)
278+
webrick
279+
rails (7.1.1)
280+
actioncable (= 7.1.1)
281+
actionmailbox (= 7.1.1)
282+
actionmailer (= 7.1.1)
283+
actionpack (= 7.1.1)
284+
actiontext (= 7.1.1)
285+
actionview (= 7.1.1)
286+
activejob (= 7.1.1)
287+
activemodel (= 7.1.1)
288+
activerecord (= 7.1.1)
289+
activestorage (= 7.1.1)
290+
activesupport (= 7.1.1)
271291
bundler (>= 1.15.0)
272-
railties (= 7.0.7.2)
273-
rails-dom-testing (2.1.1)
292+
railties (= 7.1.1)
293+
rails-dom-testing (2.2.0)
274294
activesupport (>= 5.0.0)
275295
minitest
276296
nokogiri (>= 1.6)
@@ -284,19 +304,24 @@ GEM
284304
actionview (> 3.1)
285305
activesupport (> 3.1)
286306
railties (> 3.1)
287-
railties (7.0.7.2)
288-
actionpack (= 7.0.7.2)
289-
activesupport (= 7.0.7.2)
290-
method_source
307+
railties (7.1.1)
308+
actionpack (= 7.1.1)
309+
activesupport (= 7.1.1)
310+
irb
311+
rackup (>= 1.0.0)
291312
rake (>= 12.2)
292-
thor (~> 1.0)
293-
zeitwerk (~> 2.5)
313+
thor (~> 1.0, >= 1.2.2)
314+
zeitwerk (~> 2.6)
294315
rainbow (3.1.1)
295-
rake (13.0.6)
316+
rake (13.1.0)
317+
rdoc (6.6.2)
318+
psych (>= 4.0.0)
296319
redis (4.8.1)
297320
redis-objects (1.7.0)
298321
redis
299322
regexp_parser (2.2.1)
323+
reline (0.4.2)
324+
io-console (~> 0.5)
300325
responders (3.1.0)
301326
actionpack (>= 5.2)
302327
railties (>= 5.2)
@@ -356,10 +381,11 @@ GEM
356381
state_machines-activerecord (0.8.0)
357382
activerecord (>= 5.1)
358383
state_machines-activemodel (>= 0.8.0)
359-
thor (1.2.2)
384+
stringio (3.1.0)
385+
thor (1.3.0)
360386
thread_safe (0.3.6)
361387
tilt (2.2.0)
362-
timeout (0.4.0)
388+
timeout (0.4.1)
363389
tzinfo (2.0.6)
364390
concurrent-ruby (~> 1.0)
365391
unicode-display_width (2.1.0)
@@ -376,10 +402,11 @@ GEM
376402
addressable (>= 2.8.0)
377403
crack (>= 0.3.2)
378404
hashdiff (>= 0.4.0, < 2.0.0)
379-
websocket-driver (0.7.5)
405+
webrick (1.8.1)
406+
websocket-driver (0.7.6)
380407
websocket-extensions (>= 0.1.0)
381408
websocket-extensions (0.1.5)
382-
zeitwerk (2.6.8)
409+
zeitwerk (2.6.12)
383410

384411
PLATFORMS
385412
arm64-darwin-21
@@ -390,7 +417,6 @@ PLATFORMS
390417
DEPENDENCIES
391418
byebug
392419
faker
393-
mini_racer
394420
mocha
395421
mysql2
396422
pg

dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: shipit-engine
55
type: rails
66

77
up:
8-
- homebrew:
8+
- packages:
99
- sqlite
1010
- ruby:
1111
version: 2.7.5

0 commit comments

Comments
 (0)