Skip to content

Commit 1f95570

Browse files
ankaneankane
committed
Updated Rails to 6.1
1 parent e4f33be commit 1f95570

File tree

4 files changed

+91
-84
lines changed

4 files changed

+91
-84
lines changed

‎Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org"
22

3-
gem "rails", "~> 6.0.0"
3+
gem "rails", "~> 6.1.0"
44
gem "blazer"
55
gem "puma"
66
gem "tzinfo-data"

‎Gemfile.lock

Lines changed: 75 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,84 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.0.4.4)
5-
actionpack (= 6.0.4.4)
4+
actioncable (6.1.4.4)
5+
actionpack (= 6.1.4.4)
6+
activesupport (= 6.1.4.4)
67
nio4r (~> 2.0)
78
websocket-driver (>= 0.6.1)
8-
actionmailbox (6.0.4.4)
9-
actionpack (= 6.0.4.4)
10-
activejob (= 6.0.4.4)
11-
activerecord (= 6.0.4.4)
12-
activestorage (= 6.0.4.4)
13-
activesupport (= 6.0.4.4)
9+
actionmailbox (6.1.4.4)
10+
actionpack (= 6.1.4.4)
11+
activejob (= 6.1.4.4)
12+
activerecord (= 6.1.4.4)
13+
activestorage (= 6.1.4.4)
14+
activesupport (= 6.1.4.4)
1415
mail (>= 2.7.1)
15-
actionmailer (6.0.4.4)
16-
actionpack (= 6.0.4.4)
17-
actionview (= 6.0.4.4)
18-
activejob (= 6.0.4.4)
16+
actionmailer (6.1.4.4)
17+
actionpack (= 6.1.4.4)
18+
actionview (= 6.1.4.4)
19+
activejob (= 6.1.4.4)
20+
activesupport (= 6.1.4.4)
1921
mail (~> 2.5, >= 2.5.4)
2022
rails-dom-testing (~> 2.0)
21-
actionpack (6.0.4.4)
22-
actionview (= 6.0.4.4)
23-
activesupport (= 6.0.4.4)
24-
rack (~> 2.0, >= 2.0.8)
23+
actionpack (6.1.4.4)
24+
actionview (= 6.1.4.4)
25+
activesupport (= 6.1.4.4)
26+
rack (~> 2.0, >= 2.0.9)
2527
rack-test (>= 0.6.3)
2628
rails-dom-testing (~> 2.0)
2729
rails-html-sanitizer (~> 1.0, >= 1.2.0)
28-
actiontext (6.0.4.4)
29-
actionpack (= 6.0.4.4)
30-
activerecord (= 6.0.4.4)
31-
activestorage (= 6.0.4.4)
32-
activesupport (= 6.0.4.4)
30+
actiontext (6.1.4.4)
31+
actionpack (= 6.1.4.4)
32+
activerecord (= 6.1.4.4)
33+
activestorage (= 6.1.4.4)
34+
activesupport (= 6.1.4.4)
3335
nokogiri (>= 1.8.5)
34-
actionview (6.0.4.4)
35-
activesupport (= 6.0.4.4)
36+
actionview (6.1.4.4)
37+
activesupport (= 6.1.4.4)
3638
builder (~> 3.1)
3739
erubi (~> 1.4)
3840
rails-dom-testing (~> 2.0)
3941
rails-html-sanitizer (~> 1.1, >= 1.2.0)
40-
activejob (6.0.4.4)
41-
activesupport (= 6.0.4.4)
42+
activejob (6.1.4.4)
43+
activesupport (= 6.1.4.4)
4244
globalid (>= 0.3.6)
43-
activemodel (6.0.4.4)
44-
activesupport (= 6.0.4.4)
45-
activerecord (6.0.4.4)
46-
activemodel (= 6.0.4.4)
47-
activesupport (= 6.0.4.4)
45+
activemodel (6.1.4.4)
46+
activesupport (= 6.1.4.4)
47+
activerecord (6.1.4.4)
48+
activemodel (= 6.1.4.4)
49+
activesupport (= 6.1.4.4)
4850
activerecord6-redshift-adapter (1.2.1)
4951
activerecord (~> 6.0)
5052
pg (~> 1.0)
51-
activestorage (6.0.4.4)
52-
actionpack (= 6.0.4.4)
53-
activejob (= 6.0.4.4)
54-
activerecord (= 6.0.4.4)
53+
activestorage (6.1.4.4)
54+
actionpack (= 6.1.4.4)
55+
activejob (= 6.1.4.4)
56+
activerecord (= 6.1.4.4)
57+
activesupport (= 6.1.4.4)
5558
marcel (~> 1.0.0)
56-
activesupport (6.0.4.4)
59+
mini_mime (>= 1.1.0)
60+
activesupport (6.1.4.4)
5761
concurrent-ruby (~> 1.0, >= 1.0.2)
58-
i18n (>= 0.7, < 2)
59-
minitest (~> 5.1)
60-
tzinfo (~> 1.1)
61-
zeitwerk (~> 2.2, >= 2.2.2)
62+
i18n (>= 1.6, < 2)
63+
minitest (>= 5.1)
64+
tzinfo (~> 2.0)
65+
zeitwerk (~> 2.3)
6266
addressable (2.8.0)
6367
public_suffix (>= 2.0.2, < 5.0)
6468
anomaly_detection (0.1.3)
6569
rice (>= 4.0.2)
6670
aws-eventstream (1.2.0)
67-
aws-partitions (1.539.0)
68-
aws-sdk-athena (1.44.0)
69-
aws-sdk-core (~> 3, >= 3.122.0)
71+
aws-partitions (1.544.0)
72+
aws-sdk-athena (1.45.0)
73+
aws-sdk-core (~> 3, >= 3.125.0)
7074
aws-sigv4 (~> 1.1)
71-
aws-sdk-core (3.124.0)
75+
aws-sdk-core (3.125.1)
7276
aws-eventstream (~> 1, >= 1.0.2)
7377
aws-partitions (~> 1, >= 1.525.0)
7478
aws-sigv4 (~> 1.1)
7579
jmespath (~> 1.0)
76-
aws-sdk-glue (1.100.0)
77-
aws-sdk-core (~> 3, >= 3.122.0)
80+
aws-sdk-glue (1.101.0)
81+
aws-sdk-core (~> 3, >= 3.125.0)
7882
aws-sigv4 (~> 1.1)
7983
aws-sigv4 (1.4.0)
8084
aws-eventstream (~> 1, >= 1.0.2)
@@ -83,7 +87,7 @@ GEM
8387
chartkick (>= 3.2)
8488
railties (>= 5)
8589
safely_block (>= 0.1.1)
86-
bson (4.12.1)
90+
bson (4.13.0)
8791
builder (3.2.4)
8892
cassandra-driver (3.2.5)
8993
ione (~> 1.2)
@@ -146,7 +150,7 @@ GEM
146150
multi_json (~> 1.11)
147151
os (>= 0.9, < 2.0)
148152
signet (>= 0.16, < 2.a)
149-
hashie (4.1.0)
153+
hashie (5.0.0)
150154
hexspace (0.1.1)
151155
thrift
152156
httpclient (2.8.3)
@@ -202,41 +206,41 @@ GEM
202206
rack (2.2.3)
203207
rack-test (1.1.0)
204208
rack (>= 1.0, < 3)
205-
rails (6.0.4.4)
206-
actioncable (= 6.0.4.4)
207-
actionmailbox (= 6.0.4.4)
208-
actionmailer (= 6.0.4.4)
209-
actionpack (= 6.0.4.4)
210-
actiontext (= 6.0.4.4)
211-
actionview (= 6.0.4.4)
212-
activejob (= 6.0.4.4)
213-
activemodel (= 6.0.4.4)
214-
activerecord (= 6.0.4.4)
215-
activestorage (= 6.0.4.4)
216-
activesupport (= 6.0.4.4)
217-
bundler (>= 1.3.0)
218-
railties (= 6.0.4.4)
209+
rails (6.1.4.4)
210+
actioncable (= 6.1.4.4)
211+
actionmailbox (= 6.1.4.4)
212+
actionmailer (= 6.1.4.4)
213+
actionpack (= 6.1.4.4)
214+
actiontext (= 6.1.4.4)
215+
actionview (= 6.1.4.4)
216+
activejob (= 6.1.4.4)
217+
activemodel (= 6.1.4.4)
218+
activerecord (= 6.1.4.4)
219+
activestorage (= 6.1.4.4)
220+
activesupport (= 6.1.4.4)
221+
bundler (>= 1.15.0)
222+
railties (= 6.1.4.4)
219223
sprockets-rails (>= 2.0.0)
220224
rails-dom-testing (2.0.3)
221225
activesupport (>= 4.2.0)
222226
nokogiri (>= 1.6)
223227
rails-html-sanitizer (1.4.2)
224228
loofah (~> 2.3)
225-
railties (6.0.4.4)
226-
actionpack (= 6.0.4.4)
227-
activesupport (= 6.0.4.4)
229+
railties (6.1.4.4)
230+
actionpack (= 6.1.4.4)
231+
activesupport (= 6.1.4.4)
228232
method_source
229-
rake (>= 0.8.7)
230-
thor (>= 0.20.3, < 2.0)
233+
rake (>= 0.13)
234+
thor (~> 1.0)
231235
rake (13.0.6)
232236
representable (3.1.1)
233237
declarative (< 0.1.0)
234238
trailblazer-option (>= 0.1.1, < 0.2.0)
235239
uber (< 0.2.0)
236-
restforce (5.2.0)
240+
restforce (5.2.2)
237241
faraday (>= 0.9.0, <= 2.0)
238242
faraday_middleware (>= 0.8.8, <= 2.0)
239-
hashie (>= 1.2.0, < 5.0)
243+
hashie (>= 1.2.0, < 6.0)
240244
jwt (>= 1.5.6)
241245
retriable (3.1.2)
242246
rexml (3.2.5)
@@ -257,14 +261,13 @@ GEM
257261
sprockets (>= 3.0.0)
258262
sqlite3 (1.4.2)
259263
thor (1.2.1)
260-
thread_safe (0.3.6)
261264
thrift (0.15.0)
262265
trailblazer-option (0.1.2)
263266
trend (0.1.2)
264267
typhoeus (1.4.0)
265268
ethon (>= 0.9.0)
266-
tzinfo (1.2.9)
267-
thread_safe (~> 0.1)
269+
tzinfo (2.0.4)
270+
concurrent-ruby (~> 1.0)
268271
tzinfo-data (1.2021.5)
269272
tzinfo (>= 1.0.0)
270273
uber (0.1.0)
@@ -296,7 +299,7 @@ DEPENDENCIES
296299
pg
297300
presto-client
298301
puma
299-
rails (~> 6.0.0)
302+
rails (~> 6.1.0)
300303
restforce
301304
sqlite3
302305
trend

‎config/application.rb

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
require "bundler/setup"
22
Bundler.require
3-
require "rails/all"
3+
4+
require "rails"
5+
6+
%w(
7+
active_record/railtie
8+
action_controller/railtie
9+
action_mailer/railtie
10+
action_view/railtie
11+
sprockets/railtie
12+
).each do |railtie|
13+
begin
14+
require railtie
15+
rescue LoadError
16+
end
17+
end
418

519
abort "No DATABASE_URL" unless ENV["DATABASE_URL"]
620

‎config/puma.rb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,3 @@
1010
port ENV['PORT'] || 3000
1111
end
1212
environment ENV['RACK_ENV'] || 'production'
13-
14-
on_worker_boot do
15-
# worker specific setup
16-
ActiveSupport.on_load(:active_record) do
17-
config = ActiveRecord::Base.configurations[Rails.env] ||
18-
Rails.application.config.database_configuration[Rails.env]
19-
config['pool'] = ENV['MAX_THREADS'] || 16
20-
ActiveRecord::Base.establish_connection(config)
21-
end
22-
end

0 commit comments

Comments
 (0)