Skip to content

Commit c3b8e1d

Browse files
Revert "Sc 15230" (#5613)
Reverts #5595
1 parent 01228d9 commit c3b8e1d

File tree

2 files changed

+57
-59
lines changed

2 files changed

+57
-59
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ git_source(:github) do |repo_name|
77
end
88

99
gem "dotenv-rails"
10-
gem "rails", "6.1.7.10"
10+
gem "rails", "~> 6"
1111
gem "active_hash", "~> 2.3.0"
1212
gem "active_record_union"
1313
gem "activerecord-import"

Gemfile.lock

Lines changed: 56 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.1.7.10)
5-
actionpack (= 6.1.7.10)
6-
activesupport (= 6.1.7.10)
4+
actioncable (6.1.6.1)
5+
actionpack (= 6.1.6.1)
6+
activesupport (= 6.1.6.1)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
9-
actionmailbox (6.1.7.10)
10-
actionpack (= 6.1.7.10)
11-
activejob (= 6.1.7.10)
12-
activerecord (= 6.1.7.10)
13-
activestorage (= 6.1.7.10)
14-
activesupport (= 6.1.7.10)
9+
actionmailbox (6.1.6.1)
10+
actionpack (= 6.1.6.1)
11+
activejob (= 6.1.6.1)
12+
activerecord (= 6.1.6.1)
13+
activestorage (= 6.1.6.1)
14+
activesupport (= 6.1.6.1)
1515
mail (>= 2.7.1)
16-
actionmailer (6.1.7.10)
17-
actionpack (= 6.1.7.10)
18-
actionview (= 6.1.7.10)
19-
activejob (= 6.1.7.10)
20-
activesupport (= 6.1.7.10)
16+
actionmailer (6.1.6.1)
17+
actionpack (= 6.1.6.1)
18+
actionview (= 6.1.6.1)
19+
activejob (= 6.1.6.1)
20+
activesupport (= 6.1.6.1)
2121
mail (~> 2.5, >= 2.5.4)
2222
rails-dom-testing (~> 2.0)
23-
actionpack (6.1.7.10)
24-
actionview (= 6.1.7.10)
25-
activesupport (= 6.1.7.10)
23+
actionpack (6.1.6.1)
24+
actionview (= 6.1.6.1)
25+
activesupport (= 6.1.6.1)
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.10)
31-
actionpack (= 6.1.7.10)
32-
activerecord (= 6.1.7.10)
33-
activestorage (= 6.1.7.10)
34-
activesupport (= 6.1.7.10)
30+
actiontext (6.1.6.1)
31+
actionpack (= 6.1.6.1)
32+
activerecord (= 6.1.6.1)
33+
activestorage (= 6.1.6.1)
34+
activesupport (= 6.1.6.1)
3535
nokogiri (>= 1.8.5)
36-
actionview (6.1.7.10)
37-
activesupport (= 6.1.7.10)
36+
actionview (6.1.6.1)
37+
activesupport (= 6.1.6.1)
3838
builder (~> 3.1)
3939
erubi (~> 1.4)
4040
rails-dom-testing (~> 2.0)
@@ -44,24 +44,24 @@ GEM
4444
active_record_query_trace (1.8)
4545
active_record_union (1.3.0)
4646
activerecord (>= 4.0)
47-
activejob (6.1.7.10)
48-
activesupport (= 6.1.7.10)
47+
activejob (6.1.6.1)
48+
activesupport (= 6.1.6.1)
4949
globalid (>= 0.3.6)
50-
activemodel (6.1.7.10)
51-
activesupport (= 6.1.7.10)
52-
activerecord (6.1.7.10)
53-
activemodel (= 6.1.7.10)
54-
activesupport (= 6.1.7.10)
50+
activemodel (6.1.6.1)
51+
activesupport (= 6.1.6.1)
52+
activerecord (6.1.6.1)
53+
activemodel (= 6.1.6.1)
54+
activesupport (= 6.1.6.1)
5555
activerecord-import (1.4.0)
5656
activerecord (>= 4.2)
57-
activestorage (6.1.7.10)
58-
actionpack (= 6.1.7.10)
59-
activejob (= 6.1.7.10)
60-
activerecord (= 6.1.7.10)
61-
activesupport (= 6.1.7.10)
57+
activestorage (6.1.6.1)
58+
actionpack (= 6.1.6.1)
59+
activejob (= 6.1.6.1)
60+
activerecord (= 6.1.6.1)
61+
activesupport (= 6.1.6.1)
6262
marcel (~> 1.0)
6363
mini_mime (>= 1.1.0)
64-
activesupport (6.1.7.10)
64+
activesupport (6.1.6.1)
6565
concurrent-ruby (~> 1.0, >= 1.0.2)
6666
i18n (>= 1.6, < 2)
6767
minitest (>= 5.1)
@@ -77,7 +77,6 @@ GEM
7777
activerecord (>= 4.0)
7878
autoprefixer-rails (10.4.7.0)
7979
execjs (~> 2)
80-
base64 (0.2.0)
8180
bcp47 (0.3.3)
8281
i18n
8382
bcrypt (3.1.18)
@@ -367,7 +366,7 @@ GEM
367366
lumberjack (1.2.8)
368367
mail (2.7.1)
369368
mini_mime (>= 0.1.1)
370-
marcel (1.0.4)
369+
marcel (1.0.2)
371370
matrix (0.4.2)
372371
memery (1.4.1)
373372
ruby2_keywords (~> 0.0.2)
@@ -451,20 +450,20 @@ GEM
451450
rack
452451
rack-test (2.1.0)
453452
rack (>= 1.3)
454-
rails (6.1.7.10)
455-
actioncable (= 6.1.7.10)
456-
actionmailbox (= 6.1.7.10)
457-
actionmailer (= 6.1.7.10)
458-
actionpack (= 6.1.7.10)
459-
actiontext (= 6.1.7.10)
460-
actionview (= 6.1.7.10)
461-
activejob (= 6.1.7.10)
462-
activemodel (= 6.1.7.10)
463-
activerecord (= 6.1.7.10)
464-
activestorage (= 6.1.7.10)
465-
activesupport (= 6.1.7.10)
453+
rails (6.1.6.1)
454+
actioncable (= 6.1.6.1)
455+
actionmailbox (= 6.1.6.1)
456+
actionmailer (= 6.1.6.1)
457+
actionpack (= 6.1.6.1)
458+
actiontext (= 6.1.6.1)
459+
actionview (= 6.1.6.1)
460+
activejob (= 6.1.6.1)
461+
activemodel (= 6.1.6.1)
462+
activerecord (= 6.1.6.1)
463+
activestorage (= 6.1.6.1)
464+
activesupport (= 6.1.6.1)
466465
bundler (>= 1.15.0)
467-
railties (= 6.1.7.10)
466+
railties (= 6.1.6.1)
468467
sprockets-rails (>= 2.0.0)
469468
rails-controller-testing (1.0.5)
470469
actionpack (>= 5.0.1.rc1)
@@ -480,9 +479,9 @@ GEM
480479
ruby-graphviz (~> 1.2)
481480
rails-html-sanitizer (1.4.3)
482481
loofah (~> 2.3)
483-
railties (6.1.7.10)
484-
actionpack (= 6.1.7.10)
485-
activesupport (= 6.1.7.10)
482+
railties (6.1.6.1)
483+
actionpack (= 6.1.6.1)
484+
activesupport (= 6.1.6.1)
486485
method_source
487486
rake (>= 12.2)
488487
thor (~> 1.0)
@@ -692,8 +691,7 @@ GEM
692691
semantic_range (>= 2.3.0)
693692
webrick (1.9.1)
694693
websocket (1.2.10)
695-
websocket-driver (0.7.7)
696-
base64
694+
websocket-driver (0.7.5)
697695
websocket-extensions (>= 0.1.0)
698696
websocket-extensions (0.1.5)
699697
whenever (1.0.0)
@@ -793,7 +791,7 @@ DEPENDENCIES
793791
puma
794792
rack-attack
795793
rack-mini-profiler
796-
rails (= 6.1.7.10)
794+
rails (~> 6)
797795
rails-controller-testing
798796
rails-erd
799797
rb-readline

0 commit comments

Comments
 (0)