Skip to content

Commit a423f8c

Browse files
JoeDupuisJoeDupuis
committed
Update rails
1 parent 8cff177 commit a423f8c

File tree

6 files changed

+124
-122
lines changed

6 files changed

+124
-122
lines changed

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ gem "debug"
1616

1717

1818
# Dependencies for Rails tests
19-
gem "rails", github: "rails/rails", branch: "main"
19+
gem "rails"
2020
gem "propshaft", ">= 0.1.7"
2121
gem "image_processing", "~> 1.2"
2222
gem "sqlite3", ">= 1.6.6"

‎Gemfile.lock‎

Lines changed: 118 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,140 +1,117 @@
1-
GIT
2-
remote: https://github.com/rails/rails.git
3-
revision: 21bbf5aeef607298fbc0f6bc88ef862c452d62d7
4-
branch: main
1+
PATH
2+
remote: .
53
specs:
6-
actioncable (8.0.0.alpha)
7-
actionpack (= 8.0.0.alpha)
8-
activesupport (= 8.0.0.alpha)
4+
azure-blob (0.5.8)
5+
rexml
6+
7+
GEM
8+
remote: https://rubygems.org/
9+
specs:
10+
actioncable (8.0.2)
11+
actionpack (= 8.0.2)
12+
activesupport (= 8.0.2)
913
nio4r (~> 2.0)
1014
websocket-driver (>= 0.6.1)
1115
zeitwerk (~> 2.6)
12-
actionmailbox (8.0.0.alpha)
13-
actionpack (= 8.0.0.alpha)
14-
activejob (= 8.0.0.alpha)
15-
activerecord (= 8.0.0.alpha)
16-
activestorage (= 8.0.0.alpha)
17-
activesupport (= 8.0.0.alpha)
16+
actionmailbox (8.0.2)
17+
actionpack (= 8.0.2)
18+
activejob (= 8.0.2)
19+
activerecord (= 8.0.2)
20+
activestorage (= 8.0.2)
21+
activesupport (= 8.0.2)
1822
mail (>= 2.8.0)
19-
actionmailer (8.0.0.alpha)
20-
actionpack (= 8.0.0.alpha)
21-
actionview (= 8.0.0.alpha)
22-
activejob (= 8.0.0.alpha)
23-
activesupport (= 8.0.0.alpha)
23+
actionmailer (8.0.2)
24+
actionpack (= 8.0.2)
25+
actionview (= 8.0.2)
26+
activejob (= 8.0.2)
27+
activesupport (= 8.0.2)
2428
mail (>= 2.8.0)
2529
rails-dom-testing (~> 2.2)
26-
actionpack (8.0.0.alpha)
27-
actionview (= 8.0.0.alpha)
28-
activesupport (= 8.0.0.alpha)
30+
actionpack (8.0.2)
31+
actionview (= 8.0.2)
32+
activesupport (= 8.0.2)
2933
nokogiri (>= 1.8.5)
30-
racc
3134
rack (>= 2.2.4)
3235
rack-session (>= 1.0.1)
3336
rack-test (>= 0.6.3)
3437
rails-dom-testing (~> 2.2)
3538
rails-html-sanitizer (~> 1.6)
3639
useragent (~> 0.16)
37-
actiontext (8.0.0.alpha)
38-
actionpack (= 8.0.0.alpha)
39-
activerecord (= 8.0.0.alpha)
40-
activestorage (= 8.0.0.alpha)
41-
activesupport (= 8.0.0.alpha)
40+
actiontext (8.0.2)
41+
actionpack (= 8.0.2)
42+
activerecord (= 8.0.2)
43+
activestorage (= 8.0.2)
44+
activesupport (= 8.0.2)
4245
globalid (>= 0.6.0)
4346
nokogiri (>= 1.8.5)
44-
actionview (8.0.0.alpha)
45-
activesupport (= 8.0.0.alpha)
47+
actionview (8.0.2)
48+
activesupport (= 8.0.2)
4649
builder (~> 3.1)
4750
erubi (~> 1.11)
4851
rails-dom-testing (~> 2.2)
4952
rails-html-sanitizer (~> 1.6)
50-
activejob (8.0.0.alpha)
51-
activesupport (= 8.0.0.alpha)
53+
activejob (8.0.2)
54+
activesupport (= 8.0.2)
5255
globalid (>= 0.3.6)
53-
activemodel (8.0.0.alpha)
54-
activesupport (= 8.0.0.alpha)
55-
activerecord (8.0.0.alpha)
56-
activemodel (= 8.0.0.alpha)
57-
activesupport (= 8.0.0.alpha)
56+
activemodel (8.0.2)
57+
activesupport (= 8.0.2)
58+
activerecord (8.0.2)
59+
activemodel (= 8.0.2)
60+
activesupport (= 8.0.2)
5861
timeout (>= 0.4.0)
59-
activestorage (8.0.0.alpha)
60-
actionpack (= 8.0.0.alpha)
61-
activejob (= 8.0.0.alpha)
62-
activerecord (= 8.0.0.alpha)
63-
activesupport (= 8.0.0.alpha)
62+
activestorage (8.0.2)
63+
actionpack (= 8.0.2)
64+
activejob (= 8.0.2)
65+
activerecord (= 8.0.2)
66+
activesupport (= 8.0.2)
6467
marcel (~> 1.0)
65-
activesupport (8.0.0.alpha)
68+
activesupport (8.0.2)
6669
base64
70+
benchmark (>= 0.3)
6771
bigdecimal
68-
concurrent-ruby (~> 1.0, >= 1.0.2)
72+
concurrent-ruby (~> 1.0, >= 1.3.1)
6973
connection_pool (>= 2.2.5)
7074
drb
7175
i18n (>= 1.6, < 2)
76+
logger (>= 1.4.2)
7277
minitest (>= 5.1)
78+
securerandom (>= 0.3)
7379
tzinfo (~> 2.0, >= 2.0.5)
74-
rails (8.0.0.alpha)
75-
actioncable (= 8.0.0.alpha)
76-
actionmailbox (= 8.0.0.alpha)
77-
actionmailer (= 8.0.0.alpha)
78-
actionpack (= 8.0.0.alpha)
79-
actiontext (= 8.0.0.alpha)
80-
actionview (= 8.0.0.alpha)
81-
activejob (= 8.0.0.alpha)
82-
activemodel (= 8.0.0.alpha)
83-
activerecord (= 8.0.0.alpha)
84-
activestorage (= 8.0.0.alpha)
85-
activesupport (= 8.0.0.alpha)
86-
bundler (>= 1.15.0)
87-
railties (= 8.0.0.alpha)
88-
railties (8.0.0.alpha)
89-
actionpack (= 8.0.0.alpha)
90-
activesupport (= 8.0.0.alpha)
91-
irb (~> 1.13)
92-
rackup (>= 1.0.0)
93-
rake (>= 12.2)
94-
thor (~> 1.0, >= 1.2.2)
95-
zeitwerk (~> 2.6)
96-
97-
PATH
98-
remote: .
99-
specs:
100-
azure-blob (0.5.8)
101-
rexml
102-
103-
GEM
104-
remote: https://rubygems.org/
105-
specs:
80+
uri (>= 0.13.1)
10681
ast (2.4.2)
10782
base64 (0.2.0)
108-
bcrypt_pbkdf (1.1.1)
10983
bcrypt_pbkdf (1.1.1-arm64-darwin)
110-
bigdecimal (3.1.8)
111-
builder (3.2.4)
112-
concurrent-ruby (1.2.3)
113-
connection_pool (2.4.1)
84+
benchmark (0.4.0)
85+
bigdecimal (3.1.9)
86+
builder (3.3.0)
87+
concurrent-ruby (1.3.5)
88+
connection_pool (2.5.3)
11489
crass (1.0.6)
115-
date (3.3.4)
90+
date (3.4.1)
11691
debug (1.9.2)
11792
irb (~> 1.10)
11893
reline (>= 0.3.8)
11994
drb (2.2.1)
12095
ed25519 (1.3.0)
121-
erubi (1.12.0)
96+
erb (5.0.1)
97+
erubi (1.13.1)
12298
ffi (1.17.1-arm64-darwin)
123-
ffi (1.17.1-x86_64-linux-gnu)
12499
globalid (1.2.1)
125100
activesupport (>= 6.1)
126-
i18n (1.14.5)
101+
i18n (1.14.7)
127102
concurrent-ruby (~> 1.0)
128103
image_processing (1.12.2)
129104
mini_magick (>= 4.9.5, < 5)
130105
ruby-vips (>= 2.0.17, < 3)
131-
io-console (0.7.2)
132-
irb (1.13.1)
106+
io-console (0.8.0)
107+
irb (1.15.2)
108+
pp (>= 0.6.0)
133109
rdoc (>= 4.0.0)
134110
reline (>= 0.4.2)
135111
json (2.7.2)
136112
language_server-protocol (3.17.0.3)
137-
loofah (2.22.0)
113+
logger (1.7.0)
114+
loofah (2.24.1)
138115
crass (~> 1.0.2)
139116
nokogiri (>= 1.12.0)
140117
m (1.6.2)
@@ -149,57 +126,82 @@ GEM
149126
method_source (1.1.0)
150127
mini_magick (4.12.0)
151128
mini_mime (1.1.5)
152-
minitest (5.23.1)
129+
minitest (5.25.5)
153130
minitest-fail-fast (0.1.0)
154131
minitest (~> 5)
155-
net-imap (0.4.11)
132+
net-imap (0.5.8)
156133
date
157134
net-protocol
158135
net-pop (0.1.2)
159136
net-protocol
160137
net-protocol (0.2.2)
161138
timeout
162-
net-smtp (0.5.0)
139+
net-smtp (0.5.1)
163140
net-protocol
164141
net-ssh (7.2.3)
165-
nio4r (2.7.3)
166-
nokogiri (1.16.5-arm64-darwin)
167-
racc (~> 1.4)
168-
nokogiri (1.16.5-x86_64-linux)
142+
nio4r (2.7.4)
143+
nokogiri (1.18.8-arm64-darwin)
169144
racc (~> 1.4)
170145
parallel (1.24.0)
171146
parser (3.3.1.0)
172147
ast (~> 2.4.1)
173148
racc
149+
pp (0.6.2)
150+
prettyprint
151+
prettyprint (0.2.0)
174152
propshaft (0.9.0)
175153
actionpack (>= 7.0.0)
176154
activesupport (>= 7.0.0)
177155
rack
178156
railties (>= 7.0.0)
179-
psych (5.1.2)
157+
psych (5.2.6)
158+
date
180159
stringio
181-
racc (1.8.0)
182-
rack (3.0.11)
183-
rack-session (2.0.0)
160+
racc (1.8.1)
161+
rack (3.1.15)
162+
rack-session (2.1.1)
163+
base64 (>= 0.1.0)
184164
rack (>= 3.0.0)
185-
rack-test (2.1.0)
165+
rack-test (2.2.0)
186166
rack (>= 1.3)
187-
rackup (2.1.0)
167+
rackup (2.2.1)
188168
rack (>= 3)
189-
webrick (~> 1.8)
169+
rails (8.0.2)
170+
actioncable (= 8.0.2)
171+
actionmailbox (= 8.0.2)
172+
actionmailer (= 8.0.2)
173+
actionpack (= 8.0.2)
174+
actiontext (= 8.0.2)
175+
actionview (= 8.0.2)
176+
activejob (= 8.0.2)
177+
activemodel (= 8.0.2)
178+
activerecord (= 8.0.2)
179+
activestorage (= 8.0.2)
180+
activesupport (= 8.0.2)
181+
bundler (>= 1.15.0)
182+
railties (= 8.0.2)
190183
rails-dom-testing (2.2.0)
191184
activesupport (>= 5.0.0)
192185
minitest
193186
nokogiri (>= 1.6)
194-
rails-html-sanitizer (1.6.0)
187+
rails-html-sanitizer (1.6.2)
195188
loofah (~> 2.21)
196-
nokogiri (~> 1.14)
189+
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)
190+
railties (8.0.2)
191+
actionpack (= 8.0.2)
192+
activesupport (= 8.0.2)
193+
irb (~> 1.13)
194+
rackup (>= 1.0.0)
195+
rake (>= 12.2)
196+
thor (~> 1.0, >= 1.2.2)
197+
zeitwerk (~> 2.6)
197198
rainbow (3.1.1)
198199
rake (13.2.1)
199-
rdoc (6.7.0)
200+
rdoc (6.14.0)
201+
erb
200202
psych (>= 4.0.0)
201203
regexp_parser (2.9.2)
202-
reline (0.5.7)
204+
reline (0.6.1)
203205
io-console (~> 0.5)
204206
rexml (3.2.8)
205207
strscan (>= 3.0.9)
@@ -235,24 +237,24 @@ GEM
235237
ruby-progressbar (1.13.0)
236238
ruby-vips (2.2.1)
237239
ffi (~> 1.12)
238-
sqlite3 (2.0.2-arm64-darwin)
239-
sqlite3 (2.0.2-x86_64-linux-gnu)
240-
stringio (3.1.1)
240+
securerandom (0.4.1)
241+
sqlite3 (2.6.0-arm64-darwin)
242+
stringio (3.1.7)
241243
strscan (3.1.0)
242-
thor (1.3.1)
243-
timeout (0.4.1)
244+
thor (1.3.2)
245+
timeout (0.4.3)
244246
tzinfo (2.0.6)
245247
concurrent-ruby (~> 1.0)
246248
unicode-display_width (2.5.0)
247-
useragent (0.16.10)
248-
webrick (1.8.1)
249-
websocket-driver (0.7.6)
249+
uri (1.0.3)
250+
useragent (0.16.11)
251+
websocket-driver (0.7.7)
252+
base64
250253
websocket-extensions (>= 0.1.0)
251254
websocket-extensions (0.1.5)
252-
zeitwerk (2.6.14)
255+
zeitwerk (2.7.2)
253256

254257
PLATFORMS
255-
arm64-darwin-23
256258
arm64-darwin-24
257259
x86_64-linux
258260

@@ -267,7 +269,7 @@ DEPENDENCIES
267269
minitest-fail-fast
268270
net-ssh
269271
propshaft (>= 0.1.7)
270-
rails!
272+
rails
271273
rake
272274
rubocop-rails-omakase
273275
sqlite3 (>= 1.6.6)

‎devenv.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,15 @@
106106
},
107107
"nixpkgs": {
108108
"locked": {
109-
"lastModified": 1735563628,
109+
"lastModified": 1747542820,
110110
"owner": "NixOS",
111111
"repo": "nixpkgs",
112-
"rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
112+
"rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
113113
"type": "github"
114114
},
115115
"original": {
116116
"owner": "NixOS",
117-
"ref": "nixos-24.05",
117+
"ref": "nixos-unstable",
118118
"repo": "nixpkgs",
119119
"type": "github"
120120
}

‎devenv.nix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
sshpass
1919
rsync
2020
azurite
21+
sqlite
2122
];
2223

2324
languages.ruby.enable = true;

‎devenv.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
allowUnfree: true
22
inputs:
33
nixpkgs:
4-
url: github:NixOS/nixpkgs/nixos-24.05
4+
url: github:NixOS/nixpkgs/nixos-unstable
55
nixpkgs-ruby:
66
url: github:bobvanderlinden/nixpkgs-ruby

0 commit comments

Comments
 (0)