Skip to content

Commit 75c9184

Browse files
committed
update to rails 5.2
1 parent 391348a commit 75c9184

File tree

5 files changed

+82
-81
lines changed

5 files changed

+82
-81
lines changed

.tool-versions

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ruby 2.6.0
2+
nodejs 13.7.0

Gemfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ ruby '2.6.0'
77
gem 'autoprefixer-rails'
88
gem 'bourbon', '~> 4.2.0'
99
gem 'chronic'
10-
gem 'coffee-rails', '~> 4.1.0'
1110
gem 'delayed_job_active_record'
1211
gem 'flutie'
1312
gem 'high_voltage'
@@ -19,16 +18,15 @@ gem 'normalize-rails', '~> 3.0.0'
1918
gem 'pg'
2019
gem 'puma'
2120
gem 'rack-canonical-host'
22-
gem 'rails', '~> 4.2'
21+
gem 'rails', '~> 5.2'
2322
gem 'recipient_interceptor'
2423
gem 'sass-rails', '~> 5.0'
25-
gem 'simple_form'
24+
gem 'simple_form', '~> 5'
2625
gem 'telegram-bot-ruby'
2726
gem 'title'
2827
gem 'uglifier'
2928

3029
group :development do
31-
gem 'quiet_assets'
3230
gem 'refills'
3331
gem 'spring'
3432
gem 'spring-commands-rspec'

Gemfile.lock

Lines changed: 77 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,50 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.2.11.1)
5-
actionpack (= 4.2.11.1)
6-
actionview (= 4.2.11.1)
7-
activejob (= 4.2.11.1)
4+
actioncable (5.2.4.1)
5+
actionpack (= 5.2.4.1)
6+
nio4r (~> 2.0)
7+
websocket-driver (>= 0.6.1)
8+
actionmailer (5.2.4.1)
9+
actionpack (= 5.2.4.1)
10+
actionview (= 5.2.4.1)
11+
activejob (= 5.2.4.1)
812
mail (~> 2.5, >= 2.5.4)
9-
rails-dom-testing (~> 1.0, >= 1.0.5)
10-
actionpack (4.2.11.1)
11-
actionview (= 4.2.11.1)
12-
activesupport (= 4.2.11.1)
13-
rack (~> 1.6)
14-
rack-test (~> 0.6.2)
15-
rails-dom-testing (~> 1.0, >= 1.0.5)
13+
rails-dom-testing (~> 2.0)
14+
actionpack (5.2.4.1)
15+
actionview (= 5.2.4.1)
16+
activesupport (= 5.2.4.1)
17+
rack (~> 2.0, >= 2.0.8)
18+
rack-test (>= 0.6.3)
19+
rails-dom-testing (~> 2.0)
1620
rails-html-sanitizer (~> 1.0, >= 1.0.2)
17-
actionview (4.2.11.1)
18-
activesupport (= 4.2.11.1)
21+
actionview (5.2.4.1)
22+
activesupport (= 5.2.4.1)
1923
builder (~> 3.1)
20-
erubis (~> 2.7.0)
21-
rails-dom-testing (~> 1.0, >= 1.0.5)
24+
erubi (~> 1.4)
25+
rails-dom-testing (~> 2.0)
2226
rails-html-sanitizer (~> 1.0, >= 1.0.3)
23-
activejob (4.2.11.1)
24-
activesupport (= 4.2.11.1)
25-
globalid (>= 0.3.0)
26-
activemodel (4.2.11.1)
27-
activesupport (= 4.2.11.1)
28-
builder (~> 3.1)
29-
activerecord (4.2.11.1)
30-
activemodel (= 4.2.11.1)
31-
activesupport (= 4.2.11.1)
32-
arel (~> 6.0)
33-
activesupport (4.2.11.1)
34-
i18n (~> 0.7)
27+
activejob (5.2.4.1)
28+
activesupport (= 5.2.4.1)
29+
globalid (>= 0.3.6)
30+
activemodel (5.2.4.1)
31+
activesupport (= 5.2.4.1)
32+
activerecord (5.2.4.1)
33+
activemodel (= 5.2.4.1)
34+
activesupport (= 5.2.4.1)
35+
arel (>= 9.0)
36+
activestorage (5.2.4.1)
37+
actionpack (= 5.2.4.1)
38+
activerecord (= 5.2.4.1)
39+
marcel (~> 0.3.1)
40+
activesupport (5.2.4.1)
41+
concurrent-ruby (~> 1.0, >= 1.0.2)
42+
i18n (>= 0.7, < 2)
3543
minitest (~> 5.1)
36-
thread_safe (~> 0.3, >= 0.3.4)
3744
tzinfo (~> 1.1)
3845
addressable (2.7.0)
3946
public_suffix (>= 2.0.2, < 5.0)
40-
arel (6.0.4)
47+
arel (9.0.0)
4148
autoprefixer-rails (7.1.1)
4249
execjs
4350
awesome_print (1.8.0)
@@ -71,13 +78,6 @@ GEM
7178
coderay (1.1.2)
7279
coercible (1.0.0)
7380
descendants_tracker (~> 0.0.1)
74-
coffee-rails (4.1.1)
75-
coffee-script (>= 2.2.0)
76-
railties (>= 4.0.0, < 5.1.x)
77-
coffee-script (2.4.1)
78-
coffee-script-source
79-
execjs
80-
coffee-script-source (1.12.2)
8181
concurrent-ruby (1.1.6)
8282
crack (0.4.3)
8383
safe_yaml (~> 1.0.0)
@@ -98,7 +98,7 @@ GEM
9898
dotenv (= 2.7.5)
9999
railties (>= 3.2, < 6.1)
100100
equalizer (0.0.11)
101-
erubis (2.7.0)
101+
erubi (1.9.0)
102102
execjs (2.7.0)
103103
factory_girl (4.9.0)
104104
activesupport (>= 3.0.0)
@@ -116,25 +116,28 @@ GEM
116116
activesupport (>= 4.2.0)
117117
hashdiff (1.0.1)
118118
high_voltage (3.1.2)
119-
i18n (0.9.5)
119+
i18n (1.8.2)
120120
concurrent-ruby (~> 1.0)
121121
ice_nine (0.11.2)
122122
inflecto (0.0.2)
123-
jquery-rails (4.3.1)
123+
jquery-rails (4.3.5)
124124
rails-dom-testing (>= 1, < 3)
125125
railties (>= 4.2.0)
126126
thor (>= 0.14, < 2.0)
127-
json (2.2.0)
127+
json (2.3.0)
128128
launchy (2.4.3)
129129
addressable (~> 2.3)
130-
leaflet-rails (1.0.3)
130+
leaflet-rails (1.5.1)
131131
rails (>= 4.2.0)
132132
loofah (2.4.0)
133133
crass (~> 1.0.2)
134134
nokogiri (>= 1.5.9)
135135
mail (2.7.1)
136136
mini_mime (>= 0.1.1)
137+
marcel (0.3.3)
138+
mimemagic (~> 0.3.2)
137139
method_source (0.9.2)
140+
mimemagic (0.3.4)
138141
mini_mime (1.0.2)
139142
mini_portile2 (2.4.0)
140143
minitest (5.14.0)
@@ -144,7 +147,7 @@ GEM
144147
sass (>= 3.3)
145148
newrelic_rpm (6.9.0.363)
146149
nio4r (2.5.2)
147-
nokogiri (1.10.8)
150+
nokogiri (1.10.9)
148151
mini_portile2 (~> 2.4.0)
149152
normalize-rails (3.0.3)
150153
pg (0.20.0)
@@ -159,39 +162,37 @@ GEM
159162
public_suffix (4.0.3)
160163
puma (4.3.3)
161164
nio4r (~> 2.0)
162-
quiet_assets (1.1.0)
163-
railties (>= 3.1, < 5.0)
164-
rack (1.6.13)
165+
rack (2.2.2)
165166
rack-canonical-host (0.2.3)
166167
addressable (> 0, < 3)
167168
rack (>= 1.0.0, < 3)
168-
rack-test (0.6.3)
169-
rack (>= 1.0)
169+
rack-test (1.1.0)
170+
rack (>= 1.0, < 3)
170171
rack-timeout (0.5.1)
171-
rails (4.2.11.1)
172-
actionmailer (= 4.2.11.1)
173-
actionpack (= 4.2.11.1)
174-
actionview (= 4.2.11.1)
175-
activejob (= 4.2.11.1)
176-
activemodel (= 4.2.11.1)
177-
activerecord (= 4.2.11.1)
178-
activesupport (= 4.2.11.1)
179-
bundler (>= 1.3.0, < 2.0)
180-
railties (= 4.2.11.1)
181-
sprockets-rails
182-
rails-deprecated_sanitizer (1.0.3)
183-
activesupport (>= 4.2.0.alpha)
184-
rails-dom-testing (1.0.9)
185-
activesupport (>= 4.2.0, < 5.0)
186-
nokogiri (~> 1.6)
187-
rails-deprecated_sanitizer (>= 1.0.1)
172+
rails (5.2.4.1)
173+
actioncable (= 5.2.4.1)
174+
actionmailer (= 5.2.4.1)
175+
actionpack (= 5.2.4.1)
176+
actionview (= 5.2.4.1)
177+
activejob (= 5.2.4.1)
178+
activemodel (= 5.2.4.1)
179+
activerecord (= 5.2.4.1)
180+
activestorage (= 5.2.4.1)
181+
activesupport (= 5.2.4.1)
182+
bundler (>= 1.3.0)
183+
railties (= 5.2.4.1)
184+
sprockets-rails (>= 2.0.0)
185+
rails-dom-testing (2.0.3)
186+
activesupport (>= 4.2.0)
187+
nokogiri (>= 1.6)
188188
rails-html-sanitizer (1.3.0)
189189
loofah (~> 2.3)
190-
railties (4.2.11.1)
191-
actionpack (= 4.2.11.1)
192-
activesupport (= 4.2.11.1)
190+
railties (5.2.4.1)
191+
actionpack (= 5.2.4.1)
192+
activesupport (= 5.2.4.1)
193+
method_source
193194
rake (>= 0.8.7)
194-
thor (>= 0.18.1, < 2.0)
195+
thor (>= 0.19.0, < 2.0)
195196
rake (13.0.1)
196197
recipient_interceptor (0.2.0)
197198
mail
@@ -224,9 +225,9 @@ GEM
224225
tilt (>= 1.1, < 3)
225226
shoulda-matchers (4.1.2)
226227
activesupport (>= 4.2.0)
227-
simple_form (4.0.0)
228-
actionpack (> 4)
229-
activemodel (> 4)
228+
simple_form (5.0.2)
229+
actionpack (>= 5.0)
230+
activemodel (>= 5.0)
230231
simplecov (0.17.0)
231232
docile (~> 1.1)
232233
json (>= 1.8, < 3)
@@ -271,6 +272,9 @@ GEM
271272
addressable (>= 2.3.6)
272273
crack (>= 0.3.2)
273274
hashdiff (>= 0.4.0, < 2.0.0)
275+
websocket-driver (0.7.1)
276+
websocket-extensions (>= 0.1.0)
277+
websocket-extensions (0.1.4)
274278
xpath (3.2.0)
275279
nokogiri (~> 1.8)
276280

@@ -285,7 +289,6 @@ DEPENDENCIES
285289
bundler-audit
286290
capybara-webkit
287291
chronic
288-
coffee-rails (~> 4.1.0)
289292
database_cleaner
290293
delayed_job_active_record
291294
dotenv-rails
@@ -303,16 +306,15 @@ DEPENDENCIES
303306
pry-byebug
304307
pry-rails
305308
puma
306-
quiet_assets
307309
rack-canonical-host
308310
rack-timeout
309-
rails (~> 4.2)
311+
rails (~> 5.2)
310312
recipient_interceptor
311313
refills
312314
rspec-rails (~> 3.9.0)
313315
sass-rails (~> 5.0)
314316
shoulda-matchers
315-
simple_form
317+
simple_form (~> 5)
316318
simplecov
317319
spring
318320
spring-commands-rspec

config/application.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ class Application < Rails::Application
2222
generate.view_specs false
2323
end
2424
config.action_controller.action_on_unpermitted_parameters = :raise
25-
config.active_record.raise_in_transactional_callbacks = true
2625
config.active_job.queue_adapter = :delayed_job
2726
end
2827
end
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ActionDispatch::ParamsParser::DEFAULT_PARSERS.delete(Mime::XML)
1+
ActionDispatch::Request.parameter_parsers = ActionDispatch::Request.parameter_parsers.except(:json)

0 commit comments

Comments
 (0)