-
Notifications
You must be signed in to change notification settings - Fork 0
/
6.0 to 6.1.diff
836 lines (784 loc) · 32.6 KB
/
6.0 to 6.1.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
Only in rails 6.0: .browserslistrc
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/.gitattributes rails 6.1/.gitattributes
--- rails 6.0/.gitattributes 1969-12-31 16:00:00
+++ rails 6.1/.gitattributes 2023-08-21 12:38:36
@@ -0,0 +1,10 @@
+# See https://git-scm.com/docs/gitattributes for more about git attribute files.
+
+# Mark the database schema as having been generated.
+db/schema.rb linguist-generated
+
+# Mark the yarn lockfile as having been generated.
+yarn.lock linguist-generated
+
+# Mark any vendored files as having been vendored.
+vendor/* linguist-vendored
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/.gitignore rails 6.1/.gitignore
--- rails 6.0/.gitignore 2023-08-21 12:38:24
+++ rails 6.1/.gitignore 2023-08-21 12:38:36
@@ -9,7 +9,6 @@
# Ignore the default SQLite database.
/db/*.sqlite3
-/db/*.sqlite3-journal
/db/*.sqlite3-*
# Ignore all logfiles and tempfiles.
@@ -32,10 +31,3 @@
# Ignore master key for decrypting credentials and more.
/config/master.key
-
-/public/packs
-/public/packs-test
-/node_modules
-/yarn-error.log
-yarn-debug.log*
-.yarn-integrity
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/Gemfile rails 6.1/Gemfile
--- rails 6.0/Gemfile 2023-08-21 12:38:20
+++ rails 6.1/Gemfile 2023-08-21 12:38:36
@@ -4,15 +4,15 @@
ruby '2.7.8'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
-gem 'rails', '~> 6.0.6', '>= 6.0.6.1'
+gem 'rails', '~> 6.1.7', '>= 6.1.7.4'
# Use sqlite3 as the database for Active Record
gem 'sqlite3', '~> 1.4'
# Use Puma as the app server
-gem 'puma', '~> 4.1'
+gem 'puma', '~> 5.0'
# Use SCSS for stylesheets
gem 'sass-rails', '>= 6'
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
-gem 'webpacker', '~> 4.0'
+gem 'webpacker', '~> 5.0'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
@@ -32,17 +32,19 @@
group :development do
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
- gem 'web-console', '>= 3.3.0'
- gem 'listen', '~> 3.2'
+ gem 'web-console', '>= 4.1.0'
+ # Display performance information such as SQL time and flame graphs for each request in your browser.
+ # Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
+ gem 'rack-mini-profiler', '~> 2.0'
+ gem 'listen', '~> 3.3'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
- gem 'spring-watcher-listen', '~> 2.0.0'
end
group :test do
# Adds support for Capybara system testing and selenium driver
- gem 'capybara', '>= 2.15'
- gem 'selenium-webdriver'
+ gem 'capybara', '>= 3.26'
+ gem 'selenium-webdriver', '>= 4.0.0.rc1'
# Easy installation and use of web drivers to run system tests with browsers
gem 'webdrivers'
end
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/Gemfile.lock rails 6.1/Gemfile.lock
--- rails 6.0/Gemfile.lock 2023-08-21 12:38:21
+++ rails 6.1/Gemfile.lock 2023-08-21 12:38:38
@@ -1,61 +1,65 @@
GEM
remote: https://rubygems.org/
specs:
- actioncable (6.0.6.1)
- actionpack (= 6.0.6.1)
+ actioncable (6.1.7.4)
+ actionpack (= 6.1.7.4)
+ activesupport (= 6.1.7.4)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailbox (6.0.6.1)
- actionpack (= 6.0.6.1)
- activejob (= 6.0.6.1)
- activerecord (= 6.0.6.1)
- activestorage (= 6.0.6.1)
- activesupport (= 6.0.6.1)
+ actionmailbox (6.1.7.4)
+ actionpack (= 6.1.7.4)
+ activejob (= 6.1.7.4)
+ activerecord (= 6.1.7.4)
+ activestorage (= 6.1.7.4)
+ activesupport (= 6.1.7.4)
mail (>= 2.7.1)
- actionmailer (6.0.6.1)
- actionpack (= 6.0.6.1)
- actionview (= 6.0.6.1)
- activejob (= 6.0.6.1)
+ actionmailer (6.1.7.4)
+ actionpack (= 6.1.7.4)
+ actionview (= 6.1.7.4)
+ activejob (= 6.1.7.4)
+ activesupport (= 6.1.7.4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (6.0.6.1)
- actionview (= 6.0.6.1)
- activesupport (= 6.0.6.1)
- rack (~> 2.0, >= 2.0.8)
+ actionpack (6.1.7.4)
+ actionview (= 6.1.7.4)
+ activesupport (= 6.1.7.4)
+ rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actiontext (6.0.6.1)
- actionpack (= 6.0.6.1)
- activerecord (= 6.0.6.1)
- activestorage (= 6.0.6.1)
- activesupport (= 6.0.6.1)
+ actiontext (6.1.7.4)
+ actionpack (= 6.1.7.4)
+ activerecord (= 6.1.7.4)
+ activestorage (= 6.1.7.4)
+ activesupport (= 6.1.7.4)
nokogiri (>= 1.8.5)
- actionview (6.0.6.1)
- activesupport (= 6.0.6.1)
+ actionview (6.1.7.4)
+ activesupport (= 6.1.7.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
- activejob (6.0.6.1)
- activesupport (= 6.0.6.1)
+ activejob (6.1.7.4)
+ activesupport (= 6.1.7.4)
globalid (>= 0.3.6)
- activemodel (6.0.6.1)
- activesupport (= 6.0.6.1)
- activerecord (6.0.6.1)
- activemodel (= 6.0.6.1)
- activesupport (= 6.0.6.1)
- activestorage (6.0.6.1)
- actionpack (= 6.0.6.1)
- activejob (= 6.0.6.1)
- activerecord (= 6.0.6.1)
+ activemodel (6.1.7.4)
+ activesupport (= 6.1.7.4)
+ activerecord (6.1.7.4)
+ activemodel (= 6.1.7.4)
+ activesupport (= 6.1.7.4)
+ activestorage (6.1.7.4)
+ actionpack (= 6.1.7.4)
+ activejob (= 6.1.7.4)
+ activerecord (= 6.1.7.4)
+ activesupport (= 6.1.7.4)
marcel (~> 1.0)
- activesupport (6.0.6.1)
+ mini_mime (>= 1.1.0)
+ activesupport (6.1.7.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
- i18n (>= 0.7, < 2)
- minitest (~> 5.1)
- tzinfo (~> 1.1)
- zeitwerk (~> 2.2, >= 2.2.2)
+ i18n (>= 1.6, < 2)
+ minitest (>= 5.1)
+ tzinfo (~> 2.0)
+ zeitwerk (~> 2.3)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
bindex (0.8.1)
@@ -111,28 +115,30 @@
nokogiri (1.15.4-arm64-darwin)
racc (~> 1.4)
public_suffix (5.0.3)
- puma (4.3.12)
+ puma (5.6.7)
nio4r (~> 2.0)
racc (1.7.1)
rack (2.2.8)
+ rack-mini-profiler (2.3.4)
+ rack (>= 1.2.0)
rack-proxy (0.7.6)
rack
rack-test (2.1.0)
rack (>= 1.3)
- rails (6.0.6.1)
- actioncable (= 6.0.6.1)
- actionmailbox (= 6.0.6.1)
- actionmailer (= 6.0.6.1)
- actionpack (= 6.0.6.1)
- actiontext (= 6.0.6.1)
- actionview (= 6.0.6.1)
- activejob (= 6.0.6.1)
- activemodel (= 6.0.6.1)
- activerecord (= 6.0.6.1)
- activestorage (= 6.0.6.1)
- activesupport (= 6.0.6.1)
- bundler (>= 1.3.0)
- railties (= 6.0.6.1)
+ rails (6.1.7.4)
+ actioncable (= 6.1.7.4)
+ actionmailbox (= 6.1.7.4)
+ actionmailer (= 6.1.7.4)
+ actionpack (= 6.1.7.4)
+ actiontext (= 6.1.7.4)
+ actionview (= 6.1.7.4)
+ activejob (= 6.1.7.4)
+ activemodel (= 6.1.7.4)
+ activerecord (= 6.1.7.4)
+ activestorage (= 6.1.7.4)
+ activesupport (= 6.1.7.4)
+ bundler (>= 1.15.0)
+ railties (= 6.1.7.4)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
@@ -141,12 +147,12 @@
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
- railties (6.0.6.1)
- actionpack (= 6.0.6.1)
- activesupport (= 6.0.6.1)
+ railties (6.1.7.4)
+ actionpack (= 6.1.7.4)
+ activesupport (= 6.1.7.4)
method_source
- rake (>= 0.8.7)
- thor (>= 0.20.3, < 2.0)
+ rake (>= 12.2)
+ thor (~> 1.0)
rake (13.0.6)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
@@ -168,10 +174,8 @@
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
- spring (2.1.1)
- spring-watcher-listen (2.0.1)
- listen (>= 2.7, < 4.0)
- spring (>= 1.2, < 3.0)
+ semantic_range (3.0.0)
+ spring (4.1.1)
sprockets (4.2.0)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
@@ -181,14 +185,13 @@
sprockets (>= 3.0.0)
sqlite3 (1.6.3-arm64-darwin)
thor (1.2.2)
- thread_safe (0.3.6)
tilt (2.2.0)
timeout (0.4.0)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
- tzinfo (1.2.11)
- thread_safe (~> 0.1)
+ tzinfo (2.0.6)
+ concurrent-ruby (~> 1.0)
web-console (4.2.0)
actionview (>= 6.0.0)
activemodel (>= 6.0.0)
@@ -198,10 +201,11 @@
nokogiri (~> 1.6)
rubyzip (>= 1.3.0)
selenium-webdriver (~> 4.0, < 4.11)
- webpacker (4.3.0)
- activesupport (>= 4.2)
+ webpacker (5.4.4)
+ activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
- railties (>= 4.2)
+ railties (>= 5.2)
+ semantic_range (>= 2.3.0)
websocket (1.2.9)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
@@ -215,21 +219,21 @@
DEPENDENCIES
byebug
- capybara (>= 2.15)
+ capybara (>= 3.26)
jbuilder (~> 2.7)
- listen (~> 3.2)
- puma (~> 4.1)
- rails (~> 6.0.6, >= 6.0.6.1)
+ listen (~> 3.3)
+ puma (~> 5.0)
+ rack-mini-profiler (~> 2.0)
+ rails (~> 6.1.7, >= 6.1.7.4)
sass-rails (>= 6)
- selenium-webdriver
+ selenium-webdriver (>= 4.0.0.rc1)
spring
- spring-watcher-listen (~> 2.0.0)
sqlite3 (~> 1.4)
turbolinks (~> 5)
tzinfo-data
- web-console (>= 3.3.0)
+ web-console (>= 4.1.0)
webdrivers
- webpacker (~> 4.0)
+ webpacker (~> 5.0)
RUBY VERSION
ruby 2.7.8p225
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/Rakefile rails 6.1/Rakefile
--- rails 6.0/Rakefile 2023-08-21 12:38:20
+++ rails 6.1/Rakefile 2023-08-21 12:38:36
@@ -1,6 +1,6 @@
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-require_relative 'config/application'
+require_relative "config/application"
Rails.application.load_tasks
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/app/javascript/channels/consumer.js rails 6.1/app/javascript/channels/consumer.js
--- rails 6.0/app/javascript/channels/consumer.js 2023-08-21 12:38:20
+++ rails 6.1/app/javascript/channels/consumer.js 2023-08-21 12:38:36
@@ -1,5 +1,5 @@
// Action Cable provides the framework to deal with WebSockets in Rails.
-// You can generate new channels where WebSocket features live using the `rails generate channel` command.
+// You can generate new channels where WebSocket features live using the `bin/rails generate channel` command.
import { createConsumer } from "@rails/actioncable"
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/app/javascript/packs/application.js rails 6.1/app/javascript/packs/application.js
--- rails 6.0/app/javascript/packs/application.js 2023-08-21 12:38:20
+++ rails 6.1/app/javascript/packs/application.js 2023-08-21 12:38:36
@@ -3,15 +3,11 @@
// a relevant structure within app/javascript and only use these pack files to reference
// that code so it'll be compiled.
-require("@rails/ujs").start()
-require("turbolinks").start()
-require("@rails/activestorage").start()
-require("channels")
+import Rails from "@rails/ujs"
+import Turbolinks from "turbolinks"
+import * as ActiveStorage from "@rails/activestorage"
+import "channels"
-
-// Uncomment to copy all static images under ../images to the output folder and reference
-// them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>)
-// or the `imagePath` JavaScript helper below.
-//
-// const images = require.context('../images', true)
-// const imagePath = (name) => images(name, true)
+Rails.start()
+Turbolinks.start()
+ActiveStorage.start()
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/app/views/layouts/application.html.erb rails 6.1/app/views/layouts/application.html.erb
--- rails 6.0/app/views/layouts/application.html.erb 2023-08-21 12:38:20
+++ rails 6.1/app/views/layouts/application.html.erb 2023-08-21 12:38:36
@@ -1,7 +1,8 @@
<!DOCTYPE html>
<html>
<head>
- <title>Rails60</title>
+ <title>Rails61</title>
+ <meta name="viewport" content="width=device-width,initial-scale=1">
<%= csrf_meta_tags %>
<%= csp_meta_tag %>
Only in rails 6.0: babel.config.js
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/bin/rails rails 6.1/bin/rails
--- rails 6.0/bin/rails 2023-08-21 12:38:22
+++ rails 6.1/bin/rails 2023-08-21 12:38:36
@@ -1,9 +1,5 @@
#!/usr/bin/env ruby
-begin
- load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
- raise unless e.message.include?('spring')
-end
+load File.expand_path("spring", __dir__)
APP_PATH = File.expand_path('../config/application', __dir__)
-require_relative '../config/boot'
-require 'rails/commands'
+require_relative "../config/boot"
+require "rails/commands"
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/bin/rake rails 6.1/bin/rake
--- rails 6.0/bin/rake 2023-08-21 12:38:22
+++ rails 6.1/bin/rake 2023-08-21 12:38:36
@@ -1,9 +1,5 @@
#!/usr/bin/env ruby
-begin
- load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
- raise unless e.message.include?('spring')
-end
-require_relative '../config/boot'
-require 'rake'
+load File.expand_path("spring", __dir__)
+require_relative "../config/boot"
+require "rake"
Rake.application.run
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/bin/setup rails 6.1/bin/setup
--- rails 6.0/bin/setup 2023-08-21 12:38:20
+++ rails 6.1/bin/setup 2023-08-21 12:38:36
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-require 'fileutils'
+require "fileutils"
# path to your application root.
APP_ROOT = File.expand_path('..', __dir__)
@@ -9,8 +9,8 @@
end
FileUtils.chdir APP_ROOT do
- # This script is a way to setup or update your development environment automatically.
- # This script is idempotent, so that you can run it at anytime and get an expectable outcome.
+ # This script is a way to set up or update your development environment automatically.
+ # This script is idempotent, so that you can run it at any time and get an expectable outcome.
# Add necessary setup steps to this file.
puts '== Installing dependencies =='
@@ -18,7 +18,7 @@
system('bundle check') || system!('bundle install')
# Install JavaScript dependencies
- # system('bin/yarn')
+ system! 'bin/yarn'
# puts "\n== Copying sample files =="
# unless File.exist?('config/database.yml')
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/bin/spring rails 6.1/bin/spring
--- rails 6.0/bin/spring 2023-08-21 12:38:22
+++ rails 6.1/bin/spring 2023-08-21 12:38:36
@@ -1,17 +1,14 @@
#!/usr/bin/env ruby
+if !defined?(Spring) && [nil, "development", "test"].include?(ENV["RAILS_ENV"])
+ gem "bundler"
+ require "bundler"
-# This file loads Spring without using Bundler, in order to be fast.
-# It gets overwritten when you run the `spring binstub` command.
-
-unless defined?(Spring)
- require 'rubygems'
- require 'bundler'
-
- lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
- spring = lockfile.specs.detect { |spec| spec.name == 'spring' }
- if spring
+ # Load Spring without loading other gems in the Gemfile, for speed.
+ Bundler.locked_gems&.specs&.find { |spec| spec.name == "spring" }&.tap do |spring|
Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
- gem 'spring', spring.version
- require 'spring/binstub'
+ gem "spring", spring.version
+ require "spring/binstub"
+ rescue Gem::LoadError
+ # Ignore when Spring is not installed.
end
end
Only in rails 6.0/bin: webpack
Only in rails 6.0/bin: webpack-dev-server
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/bin/yarn rails 6.1/bin/yarn
--- rails 6.0/bin/yarn 2023-08-21 12:38:20
+++ rails 6.1/bin/yarn 2023-08-21 12:38:36
@@ -1,9 +1,15 @@
#!/usr/bin/env ruby
APP_ROOT = File.expand_path('..', __dir__)
Dir.chdir(APP_ROOT) do
- begin
- exec "yarnpkg", *ARGV
- rescue Errno::ENOENT
+ yarn = ENV["PATH"].split(File::PATH_SEPARATOR).
+ select { |dir| File.expand_path(dir) != __dir__ }.
+ product(["yarn", "yarn.cmd", "yarn.ps1"]).
+ map { |dir, file| File.expand_path(file, dir) }.
+ find { |file| File.executable?(file) }
+
+ if yarn
+ exec yarn, *ARGV
+ else
$stderr.puts "Yarn executable was not detected in the system."
$stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
exit 1
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/config/application.rb rails 6.1/config/application.rb
--- rails 6.0/config/application.rb 2023-08-21 12:38:20
+++ rails 6.1/config/application.rb 2023-08-21 12:38:36
@@ -1,19 +1,22 @@
-require_relative 'boot'
+require_relative "boot"
-require 'rails/all'
+require "rails/all"
# Require the gems listed in Gemfile, including any gems
# you've limited to :test, :development, or :production.
Bundler.require(*Rails.groups)
-module Rails60
+module Rails61
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
- config.load_defaults 6.0
+ config.load_defaults 6.1
- # Settings in config/environments/* take precedence over those specified here.
- # Application configuration can go into files in config/initializers
- # -- all .rb files in that directory are automatically loaded after loading
- # the framework and any gems in your application.
+ # Configuration for the application, engines, and railties goes here.
+ #
+ # These settings can be overridden in specific environments using the files
+ # in config/environments, which are processed later.
+ #
+ # config.time_zone = "Central Time (US & Canada)"
+ # config.eager_load_paths << Rails.root.join("extras")
end
end
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/config/boot.rb rails 6.1/config/boot.rb
--- rails 6.0/config/boot.rb 2023-08-21 12:38:20
+++ rails 6.1/config/boot.rb 2023-08-21 12:38:36
@@ -1,3 +1,3 @@
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
-require 'bundler/setup' # Set up gems listed in the Gemfile.
+require "bundler/setup" # Set up gems listed in the Gemfile.
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/config/cable.yml rails 6.1/config/cable.yml
--- rails 6.0/config/cable.yml 2023-08-21 12:38:20
+++ rails 6.1/config/cable.yml 2023-08-21 12:38:36
@@ -7,4 +7,4 @@
production:
adapter: redis
url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
- channel_prefix: rails_6_0_production
+ channel_prefix: rails_6_1_production
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/config/credentials.yml.enc rails 6.1/config/credentials.yml.enc
--- rails 6.0/config/credentials.yml.enc 2023-08-21 12:38:20
+++ rails 6.1/config/credentials.yml.enc 2023-08-21 12:38:36
@@ -1 +1 @@
-Jsr7SVAijiw9U5fJ1aKzguFEsiNw6r4RfCzLomT1n9dpXAROMMGKc74Wxevv4L0FcK8+iwrv2bdQOa70X94tmvGhrsd+aVyY/W+e/4Rr/4lZMdC+uzOLRzoDJ/BtZQtRAABBZqUgRhWT2E9ocjSZl80XwVDFwI4aJY6GkHQoK7HBxdAwAf0Y5qKs2iDZAI7L9zEnq6SBsVAJAkUORvO2raM0bDPmrpMBvGCfCMsw/eTyzsQNLtHFSzm+9USBZGm87UiwpyB+wLJm7Ym+uyJpN6ClyHjNdjFPIih0hYviu8OOBFPP2BjKS25zsUAgf64xz/RmXgW4PpN75iPRyAoEuNUJnhfwBg0J/aJzTaRfIuZ4cXJaoKeKGIBv1YusOHQ3b7AtHAn0c1l/qzukgBzggdpTTRhHYruX4y3g--tIP+RQyfn3CoOZUx--koS7jgq5x6kI/OrpxIE/kQ==
\ No newline at end of file
+g7R0YWdoU8uYa3i1vsoDZMAOz22Y/Ex8C77tMon6gVKpnuuT6xmi+HmyjJ6rwI6PXuYFug0rjVXaCcJ8hEuQm+k63MX36Jyr43MUsZZQb3WBjktfqV9Q0FGKa9yJx0SiTeLNdJPFb63j0Pcr6x9Ohi4TSNxYNNL84l7yGrtlNxRBaWQnYQ0jr9/1um2ioDtqUu9fL3UOKSxKFLY1yPWyalAkvVN8dpT+dGo6Lkj71wx0KSI5oEe6td6XKO0VHzz+Z5eyyv58UgsOLpxoKyCOS37MwKSy8FQmWkFEL2ot+jUDJANZWYXWHbD8AmH0mu4BsaqvAxwdMKuRcBsoGAzX2l891J+ukV6kJDbaFUXWA6VhkJcwCAvj808igp0L5MDSGVJZYUfWFdRhdr2lGeszbUvL+SM0aWySeqR3--2ahPV5kxznUStbSC--vSB1qige3wfIjpdYaXt/SA==
\ No newline at end of file
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/config/environment.rb rails 6.1/config/environment.rb
--- rails 6.0/config/environment.rb 2023-08-21 12:38:20
+++ rails 6.1/config/environment.rb 2023-08-21 12:38:36
@@ -1,5 +1,5 @@
# Load the Rails application.
-require_relative 'application'
+require_relative "application"
# Initialize the Rails application.
Rails.application.initialize!
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/config/environments/development.rb rails 6.1/config/environments/development.rb
--- rails 6.0/config/environments/development.rb 2023-08-21 12:38:20
+++ rails 6.1/config/environments/development.rb 2023-08-21 12:38:36
@@ -1,8 +1,10 @@
+require "active_support/core_ext/integer/time"
+
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
- # In the development environment your application's code is reloaded on
- # every request. This slows down response time but is perfect for development
+ # In the development environment your application's code is reloaded any time
+ # it changes. This slows down response time but is perfect for development
# since you don't have to restart the web server when you make code changes.
config.cache_classes = false
@@ -39,6 +41,12 @@
# Print deprecation notices to the Rails logger.
config.active_support.deprecation = :log
+ # Raise exceptions for disallowed deprecations.
+ config.active_support.disallowed_deprecation = :raise
+
+ # Tell Active Support which deprecation messages to disallow.
+ config.active_support.disallowed_deprecation_warnings = []
+
# Raise an error on page load if there are pending migrations.
config.active_record.migration_error = :page_load
@@ -54,9 +62,15 @@
config.assets.quiet = true
# Raises error for missing translations.
- # config.action_view.raise_on_missing_translations = true
+ # config.i18n.raise_on_missing_translations = true
+ # Annotate rendered view with file names.
+ # config.action_view.annotate_rendered_view_with_filenames = true
+
# Use an evented file watcher to asynchronously detect changes in source code,
# routes, locales, etc. This feature depends on the listen gem.
config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+
+ # Uncomment if you wish to allow Action Cable access from any origin.
+ # config.action_cable.disable_request_forgery_protection = true
end
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/config/environments/production.rb rails 6.1/config/environments/production.rb
--- rails 6.0/config/environments/production.rb 2023-08-21 12:38:20
+++ rails 6.1/config/environments/production.rb 2023-08-21 12:38:36
@@ -1,3 +1,5 @@
+require "active_support/core_ext/integer/time"
+
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
@@ -29,7 +31,7 @@
config.assets.compile = false
# Enable serving of images, stylesheets, and JavaScripts from an asset server.
- # config.action_controller.asset_host = 'http://assets.example.com'
+ # config.asset_host = 'http://assets.example.com'
# Specifies the header that your server uses for sending files.
# config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
@@ -46,9 +48,9 @@
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
# config.force_ssl = true
- # Use the lowest log level to ensure availability of diagnostic information
- # when problems arise.
- config.log_level = :debug
+ # Include generic and useful information about system operation, but avoid logging too much
+ # information to avoid inadvertent exposure of personally identifiable information (PII).
+ config.log_level = :info
# Prepend all log lines with the following tags.
config.log_tags = [ :request_id ]
@@ -58,7 +60,7 @@
# Use a real queuing backend for Active Job (and separate queues per environment).
# config.active_job.queue_adapter = :resque
- # config.active_job.queue_name_prefix = "rails_6_0_production"
+ # config.active_job.queue_name_prefix = "rails_6_1_production"
config.action_mailer.perform_caching = false
@@ -73,11 +75,17 @@
# Send deprecation notices to registered listeners.
config.active_support.deprecation = :notify
+ # Log disallowed deprecations.
+ config.active_support.disallowed_deprecation = :log
+
+ # Tell Active Support which deprecation messages to disallow.
+ config.active_support.disallowed_deprecation_warnings = []
+
# Use default logging formatter so that PID and timestamp are not suppressed.
config.log_formatter = ::Logger::Formatter.new
# Use a different logger for distributed setups.
- # require 'syslog/logger'
+ # require "syslog/logger"
# config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
if ENV["RAILS_LOG_TO_STDOUT"].present?
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/config/environments/test.rb rails 6.1/config/environments/test.rb
--- rails 6.0/config/environments/test.rb 2023-08-21 12:38:20
+++ rails 6.1/config/environments/test.rb 2023-08-21 12:38:36
@@ -1,3 +1,5 @@
+require "active_support/core_ext/integer/time"
+
# The test environment is used exclusively to run your application's
# test suite. You never need to work with it otherwise. Remember that
# your test database is "scratch space" for the test suite and is wiped
@@ -44,6 +46,15 @@
# Print deprecation notices to the stderr.
config.active_support.deprecation = :stderr
+ # Raise exceptions for disallowed deprecations.
+ config.active_support.disallowed_deprecation = :raise
+
+ # Tell Active Support which deprecation messages to disallow.
+ config.active_support.disallowed_deprecation_warnings = []
+
# Raises error for missing translations.
- # config.action_view.raise_on_missing_translations = true
+ # config.i18n.raise_on_missing_translations = true
+
+ # Annotate rendered view with file names.
+ # config.action_view.annotate_rendered_view_with_filenames = true
end
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/config/initializers/backtrace_silencers.rb rails 6.1/config/initializers/backtrace_silencers.rb
--- rails 6.0/config/initializers/backtrace_silencers.rb 2023-08-21 12:38:20
+++ rails 6.1/config/initializers/backtrace_silencers.rb 2023-08-21 12:38:36
@@ -1,7 +1,8 @@
# Be sure to restart your server when you modify this file.
# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
-# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+# Rails.backtrace_cleaner.add_silencer { |line| /my_noisy_library/.match?(line) }
-# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
-# Rails.backtrace_cleaner.remove_silencers!
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code
+# by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
+Rails.backtrace_cleaner.remove_silencers! if ENV["BACKTRACE"]
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/config/initializers/filter_parameter_logging.rb rails 6.1/config/initializers/filter_parameter_logging.rb
--- rails 6.0/config/initializers/filter_parameter_logging.rb 2023-08-21 12:38:20
+++ rails 6.1/config/initializers/filter_parameter_logging.rb 2023-08-21 12:38:36
@@ -1,4 +1,6 @@
# Be sure to restart your server when you modify this file.
# Configure sensitive parameters which will be filtered from the log file.
-Rails.application.config.filter_parameters += [:password]
+Rails.application.config.filter_parameters += [
+ :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
+]
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/config/initializers/permissions_policy.rb rails 6.1/config/initializers/permissions_policy.rb
--- rails 6.0/config/initializers/permissions_policy.rb 1969-12-31 16:00:00
+++ rails 6.1/config/initializers/permissions_policy.rb 2023-08-21 12:38:36
@@ -0,0 +1,11 @@
+# Define an application-wide HTTP permissions policy. For further
+# information see https://developers.google.com/web/updates/2018/06/feature-policy
+#
+# Rails.application.config.permissions_policy do |f|
+# f.camera :none
+# f.gyroscope :none
+# f.microphone :none
+# f.usb :none
+# f.fullscreen :self
+# f.payment :self, "https://secure.example.com"
+# end
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/config/master.key rails 6.1/config/master.key
--- rails 6.0/config/master.key 2023-08-21 12:38:20
+++ rails 6.1/config/master.key 2023-08-21 12:38:36
@@ -1 +1 @@
-b8864b09afdd4c3eb20ee1dabc0d5f78
\ No newline at end of file
+be12abcc8a703abe4d08dcbd10e341a0
\ No newline at end of file
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/config/puma.rb rails 6.1/config/puma.rb
--- rails 6.0/config/puma.rb 2023-08-21 12:38:20
+++ rails 6.1/config/puma.rb 2023-08-21 12:38:36
@@ -8,6 +8,11 @@
min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
threads min_threads_count, max_threads_count
+# Specifies the `worker_timeout` threshold that Puma will use to wait before
+# terminating a worker in development environments.
+#
+worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development"
+
# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
#
port ENV.fetch("PORT") { 3000 }
Only in rails 6.0/config: webpack
Only in rails 6.0/config: webpacker.yml
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/config.ru rails 6.1/config.ru
--- rails 6.0/config.ru 2023-08-21 12:38:20
+++ rails 6.1/config.ru 2023-08-21 12:38:36
@@ -1,5 +1,6 @@
# This file is used by Rack-based servers to start the application.
-require_relative 'config/environment'
+require_relative "config/environment"
run Rails.application
+Rails.application.load_server
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/db/seeds.rb rails 6.1/db/seeds.rb
--- rails 6.0/db/seeds.rb 2023-08-21 12:38:20
+++ rails 6.1/db/seeds.rb 2023-08-21 12:38:36
@@ -1,5 +1,5 @@
# This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup).
+# The data can then be loaded with the bin/rails db:seed command (or created alongside the database with db:setup).
#
# Examples:
#
Only in rails 6.0/log: development.log
Only in rails 6.0: node_modules
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/package.json rails 6.1/package.json
--- rails 6.0/package.json 2023-08-21 12:38:36
+++ rails 6.1/package.json 2023-08-21 12:38:36
@@ -1,14 +1,11 @@
{
- "name": "rails_6_0",
+ "name": "rails-6-1",
"private": true,
"dependencies": {
- "@rails/actioncable": "^6.0.0",
- "@rails/activestorage": "^6.0.0",
"@rails/ujs": "^6.0.0",
- "turbolinks": "^5.2.0"
+ "turbolinks": "^5.2.0",
+ "@rails/activestorage": "^6.0.0",
+ "@rails/actioncable": "^6.0.0"
},
- "version": "0.1.0",
- "devDependencies": {
- "webpack-dev-server": "^4.15.1"
- }
+ "version": "0.1.0"
}
Only in rails 6.0: postcss.config.js
Only in rails 6.0/test/fixtures: .keep
diff --ignore-space-change --minimal --recursive --unidirectional-new-file --unified rails 6.0/test/test_helper.rb rails 6.1/test/test_helper.rb
--- rails 6.0/test/test_helper.rb 2023-08-21 12:38:20
+++ rails 6.1/test/test_helper.rb 2023-08-21 12:38:36
@@ -1,6 +1,6 @@
ENV['RAILS_ENV'] ||= 'test'
-require_relative '../config/environment'
-require 'rails/test_help'
+require_relative "../config/environment"
+require "rails/test_help"
class ActiveSupport::TestCase
# Run tests in parallel with specified workers
Only in rails 6.0/tmp: development_secret.txt
Only in rails 6.0: yarn.lock