8000 Revert "Gemfile: update rails" · pragma-git/git-scm@2f8911c · GitHub
[go: up one dir, main page]
Skip to content

Commit 2f8911c

Browse files
peffpeff
committed
Revert "Gemfile: update rails"
This reverts commit 4f11fb6. That commit was accidentally included in git#1776.
1 parent e0c7ccc commit 2f8911c

File tree

1 file changed

+67
-70
lines changed

1 file changed

+67
-70
lines changed

‎Gemfile.lock

Lines changed: 67 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.1.7.3)
5-
actionpack (= 6.1.7.3)
6-
activesupport (= 6.1.7.3)
4+
actioncable (6.1.7)
5+
actionpack (= 6.1.7)
6+
activesupport (= 6.1.7)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
9-
actionmailbox (6.1.7.3)
10-
actionpack (= 6.1.7.3)
11-
activejob (= 6.1.7.3)
12-
activerecord (= 6.1.7.3)
13-
activestorage (= 6.1.7.3)
14-
activesupport (= 6.1.7.3)
9+
actionmailbox (6.1.7)
10+
actionpack (= 6.1.7)
11+
activejob (= 6.1.7)
12+
activerecord (= 6.1.7)
13+
activestorage (= 6.1.7)
14+
activesupport (= 6.1.7)
1515
mail (>= 2.7.1)
16-
actionmailer (6.1.7.3)
17-
actionpack (= 6.1.7.3)
18-
actionview (= 6.1.7.3)
19-
activejob (= 6.1.7.3)
20-
activesupport (= 6.1.7.3)
16+
actionmailer (6.1.7)
17+
actionpack (= 6.1.7)
18+
actionview (= 6.1.7)
19+
activejob (= 6.1.7)
20+
activesupport (= 6.1.7)
2121
mail (~> 2.5, >= 2.5.4)
2222
rails-dom-testing (~> 2.0)
23-
actionpack (6.1.7.3)
24-
actionview (= 6.1.7.3)
25-
activesupport (= 6.1.7.3)
23+
actionpack (6.1.7)
24+
actionview (= 6.1.7)
25+
activesupport (= 6.1.7)
2626
rack (~> 2.0, >= 2.0.9)
2727
rack-test (>= 0.6.3)
2828
rails-dom-testing (~> 2.0)
2929
rails-html-sanitizer (~> 1.0, >= 1.2.0)
30-
actiontext (6.1.7.3)
31-
actionpack (= 6.1.7.3)
32-
activerecord (= 6.1.7.3)
33-
activestorage (= 6.1.7.3)
34-
activesupport (= 6.1.7.3)
30+
actiontext (6.1.7)
31+
actionpack (= 6.1.7)
32+
activerecord (= 6.1.7)
33+
activestorage (= 6.1.7)
34+
activesupport (= 6.1.7)
3535
nokogiri (>= 1.8.5)
36-
actionview (6.1.7.3)
37-
activesupport (= 6.1.7.3)
36+
actionview (6.1.7)
37+
activesupport (= 6.1.7)
3838
builder (~> 3.1)
3939
erubi (~> 1.4)
4040
rails-dom-testing (~> 2.0)
4141
rails-html-sanitizer (~> 1.1, >= 1.2.0)
42-
activejob (6.1.7.3)
43-
activesupport (= 6.1.7.3)
42+
activejob (6.1.7)
43+
activesupport (= 6.1.7)
4444
globalid (>= 0.3.6)
45-
activemodel (6.1.7.3)
46-
activesupport (= 6.1.7.3)
47-
activerecord (6.1.7.3)
48-
activemodel (= 6.1.7.3)
49-
activesupport (= 6.1.7.3)
50-
activestorage (6.1.7.3)
51-
actionpack (= 6.1.7.3)
52-
activejob (= 6.1.7.3)
53-
activerecord (= 6.1.7.3)
54-
activesupport (= 6.1.7.3)
45+
activemodel (6.1.7)
46+
activesupport (= 6.1.7)
47+
activerecord (6.1.7)
48+
activemodel (= 6.1.7)
49+
activesupport (= 6.1.7)
50+
activestorage (6.1.7)
51+
actionpack (= 6.1.7)
52+
activejob (= 6.1.7)
53+
activerecord (= 6.1.7)
54+
activesupport (= 6.1.7)
5555
marcel (~> 1.0)
5656
mini_mime (>= 1.1.0)
57-
activesupport (6.1.7.3)
57+
activesupport (6.1.7)
5858
concurrent-ruby (~> 1.0, >= 1.0.2)
5959
i18n (>= 1.6, < 2)
6060
minitest (>= 5.1)
@@ -74,7 +74,7 @@ GEM
7474
builder (3.2.4)
7575
byebug (11.1.3)
7676
coderay (1.1.3)
77-
concurrent-ruby (1.2.2)
77+
concurrent-ruby (1.1.10)
7878
crack (0.4.5)
7979
rexml
8080
crass (1.0.6)
@@ -99,7 +99,7 @@ GEM
9999
elasticsearch-transport (2.0.2)
100100
faraday
101101
multi_json
102-
erubi (1.12.0)
102+
erubi (1.11.0)
103103
execjs (2.8.1)
104104
fabrication (2.22.0)
105105
factory_bot (6.2.0)
@@ -128,7 +128,7 @@ GEM
128128
faraday-rack (1.0.0)
129129
ffi (1.15.4)
130130
foreman (0.87.2)
131-
globalid (1.1.0)
131+
globalid (1.0.1)
132132
activesupport (>= 5.0)
133133
hashdiff (1.0.1)
134134
i18n (1.12.0)
@@ -141,16 +141,13 @@ GEM
141141
loofah (2.19.1)
142142
crass (~> 1.0.2)
143143
nokogiri (>= 1.5.9)
144-
mail (2.8.1)
144+
mail (2.7.1)
145145
mini_mime (>= 0.1.1)
146-
net-imap
147-
net-pop
148-
net-smtp
149146
marcel (1.0.2)
150147
method_source (1.0.0)
151148
mini_mime (1.1.2)
152-
mini_portile2 (2.8.1)
153-
minitest (5.18.0)
149+
mini_portile2 (2.8.0)
150+
minitest (5.17.0)
154151
multi_json (1.15.0)
155152
multipart-post (2.1.1)
156153
net-imap (0.3.1)
@@ -162,7 +159,7 @@ GEM
162159
net-smtp (0.3.2)
163160
net-protocol
164161
nio4r (2.5.8)
165-
nokogiri (1.14.2)
162+
nokogiri (1.13.10)
166163
mini_portile2 (~> 2.8.0)
167164
racc (~> 1.4)
168165
octokit (4.21.0)
@@ -181,25 +178,25 @@ GEM
181178
public_suffix (4.0.6)
182179
puma (5.6.4)
183180
nio4r (~> 2.0)
184-
racc (1.6.2)
181+
racc (1.6.1)
185182
rack (2.2.6.4)
186-
rack-test (2.1.0)
183+
rack-test (2.0.2)
187184
rack (>= 1.3)
188185
rack-timeout (0.6.0)
189-
rails (6.1.7.3)
190-
actioncable (= 6.1.7.3)
191-
actionmailbox (= 6.1.7.3)
192-
actionmailer (= 6.1.7.3)
193-
actionpack (= 6.1.7.3)
194-
actiontext (= 6.1.7.3)
195-
actionview (= 6.1.7.3)
196-
activejob (= 6.1.7.3)
197-
activemodel (= 6.1.7.3)
198-
activerecord (= 6.1.7.3)
199-
activestorage (= 6.1.7.3)
200-
activesupport (= 6.1.7.3)
186+
rails (6.1.7)
187+
actioncable (= 6.1.7)
188+
actionmailbox (= 6.1.7)
189+
actionmailer (= 6.1.7)
190+
actionpack (= 6.1.7)
191+
actiontext (= 6.1.7)
192+
actionview (= 6.1.7)
193+
activejob (= 6.1.7)
194+
activemodel (= 6.1.7)
195+
activerecord (= 6.1.7)
196+
activestorage (= 6.1.7)
197+
activesupport (= 6.1.7)
201198
bundler (>= 1.15.0)
202-
railties (= 6.1.7.3)
199+
railties (= 6.1.7)
203200
sprockets-rails (>= 2.0.0)
204201
rails-controller-testing (1.0.5)
205202
actionpack (>= 5.0.1.rc1)
@@ -208,16 +205,16 @@ GEM
208205
rails-dom-testing (2.0.3)
209206
activesupport (>= 4.2.0)
210207
nokogiri (>= 1.6)
211-
rails-html-sanitizer (1.5.0)
208+
rails-html-sanitizer (1.4.4)
212209
loofah (~> 2.19, >= 2.19.1)
213210
rails_12factor (0.0.3)
214211
rails_serve_static_assets
215212
rails_stdout_logging
216213
rails_serve_static_assets (0.0.5)
217214
rails_stdout_logging (0.0.5)
218-
railties (6.1.7.3)
219-
actionpack (= 6.1.7.3)
220-
activesupport (= 6.1.7.3)
215+
railties (6.1.7)
216+
actionpack (= 6.1.7)
217+
activesupport (= 6.1.7)
221218
method_source
222219
rake (>= 12.2)
223220
thor (~> 1.0)
@@ -310,9 +307,9 @@ GEM
310307
shoulda-context (2.0.0)
311308
shoulda-matchers (4.5.1)
312309
activesupport (>= 4.2.0)
313-
sprockets (4.2.0)
310+
sprockets (4.1.1)
314311
concurrent-ruby (~> 1.0)
315-
rack (>= 2.2.4, < 4)
312+
rack (> 1, < 3)
316313
sprockets-rails (3.4.2)
317314
actionpack (>= 5.2)
318315
activesupport (>= 5.2)
@@ -321,7 +318,7 @@ GEM
321318
thor (1.2.1)
322319
tilt (2.0.10)
323320
timeout (0.3.0)
324-
tzinfo (2.0.6)
321+
tzinfo (2.0.5)
325322
concurrent-ruby (~> 1.0)
326323
uglifier (4.2.0)
327324
execjs (>= 0.3.0, < 3)
@@ -334,7 +331,7 @@ GEM
334331
websocket-driver (0.7.5)
335332
websocket-extensions (>= 0.1.0)
336333
websocket-extensions (0.1.5)
337-
zeitwerk (2.6.7)
334+
zeitwerk (2.6.6)
338335

339336
PLATFORMS
340337
ruby

0 commit comments

Comments
 (0)
0