Skip to content

Commit a1841f5

Browse files
committed
Update to Rails 5.2.4.3
Applied Gemfile changes based on a fresh Rails 5.2.4.3 application. After running `rake app:update`, our customizations were re-applied to the following files: * config/application.rb * config/initializers/assets.rb * config/environments/production.rb * config/routes.rb
1 parent 378910e commit a1841f5

File tree

9 files changed

+110
-142
lines changed

9 files changed

+110
-142
lines changed

Gemfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
44
ruby '~> 2.6.3'
55

66
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
7-
gem 'rails', '~> 5.2.3'
7+
gem 'rails', '~> 5.2.4', '>= 5.2.4.3'
88
# Use sqlite3 as the database for Active Record
99
gem 'sqlite3'
1010
# Use Puma as the app server
@@ -54,8 +54,8 @@ group :test do
5454
# Adds support for Capybara system testing and selenium driver
5555
gem 'capybara', '>= 2.15'
5656
gem 'selenium-webdriver'
57-
# Replacement for chromedriver-helper
58-
gem 'webdrivers', '~> 3.0'
57+
# Easy installation and use of chromedriver to run system tests with Chrome
58+
gem 'chromedriver-helper'
5959
end
6060

6161
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

+104-105
Original file line numberDiff line numberDiff line change
@@ -2,179 +2,182 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
SyslogLogger (2.0)
5-
actioncable (5.2.3)
6-
actionpack (= 5.2.3)
5+
actioncable (5.2.4.3)
6+
actionpack (= 5.2.4.3)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
9-
actionmailer (5.2.3)
10-
actionpack (= 5.2.3)
11-
actionview (= 5.2.3)
12-
activejob (= 5.2.3)
9+
actionmailer (5.2.4.3)
10+
actionpack (= 5.2.4.3)
11+
actionview (= 5.2.4.3)
12+
activejob (= 5.2.4.3)
1313
mail (~> 2.5, >= 2.5.4)
1414
rails-dom-testing (~> 2.0)
15-
actionpack (5.2.3)
16-
actionview (= 5.2.3)
17-
activesupport (= 5.2.3)
18-
rack (~> 2.0)
15+
actionpack (5.2.4.3)
16+
actionview (= 5.2.4.3)
17+
activesupport (= 5.2.4.3)
18+
rack (~> 2.0, >= 2.0.8)
1919
rack-test (>= 0.6.3)
2020
rails-dom-testing (~> 2.0)
2121
rails-html-sanitizer (~> 1.0, >= 1.0.2)
22-
actionview (5.2.3)
23-
activesupport (= 5.2.3)
22+
actionview (5.2.4.3)
23+
activesupport (= 5.2.4.3)
2424
builder (~> 3.1)
2525
erubi (~> 1.4)
2626
rails-dom-testing (~> 2.0)
2727
rails-html-sanitizer (~> 1.0, >= 1.0.3)
28-
activejob (5.2.3)
29-
activesupport (= 5.2.3)
28+
activejob (5.2.4.3)
29+
activesupport (= 5.2.4.3)
3030
globalid (>= 0.3.6)
31-
activemodel (5.2.3)
32-
activesupport (= 5.2.3)
33-
activerecord (5.2.3)
34-
activemodel (= 5.2.3)
35-
activesupport (= 5.2.3)
31+
activemodel (5.2.4.3)
32+
activesupport (= 5.2.4.3)
33+
activerecord (5.2.4.3)
34+
activemodel (= 5.2.4.3)
35+
activesupport (= 5.2.4.3)
3636
arel (>= 9.0)
37-
activestorage (5.2.3)
38-
actionpack (= 5.2.3)
39-
activerecord (= 5.2.3)
37+
activestorage (5.2.4.3)
38+
actionpack (= 5.2.4.3)
39+
activerecord (= 5.2.4.3)
4040
marcel (~> 0.3.1)
41-
activesupport (5.2.3)
41+
activesupport (5.2.4.3)
4242
concurrent-ruby (~> 1.0, >= 1.0.2)
4343
i18n (>= 0.7, < 2)
4444
minitest (~> 5.1)
4545
tzinfo (~> 1.1)
46-
addressable (2.6.0)
47-
public_suffix (>= 2.0.2, < 4.0)
46+
addressable (2.7.0)
47+
public_suffix (>= 2.0.2, < 5.0)
48+
archive-zip (0.12.0)
49+
io-like (~> 0.3.0)
4850
arel (9.0.0)
49-
bindex (0.7.0)
50-
bootsnap (1.4.4)
51+
bindex (0.8.1)
52+
bootsnap (1.4.6)
5153
msgpack (~> 1.0)
52-
builder (3.2.3)
53-
byebug (11.0.1)
54+
builder (3.2.4)
55+
byebug (11.1.3)
5456
capistrano (2.14.2)
5557
highline
5658
net-scp (>= 1.0.0)
5759
net-sftp (>= 2.0.0)
5860
net-ssh (>= 2.0.14)
5961
net-ssh-gateway (>= 1.1.0)
60-
capybara (3.20.0)
62+
capybara (3.32.2)
6163
addressable
6264
mini_mime (>= 0.1.3)
6365
nokogiri (~> 1.8)
6466
rack (>= 1.6.0)
6567
rack-test (>= 0.6.3)
66-
regexp_parser (~> 1.2)
67-
uglifier
68+
regexp_parser (~> 1.5)
6869
xpath (~> 3.2)
69-
childprocess (1.0.1)
70-
rake (< 13.0)
70+
childprocess (3.0.0)
71+
chromedriver-helper (2.1.1)
72+
archive-zip (~> 0.10)
73+
nokogiri (~> 1.8)
7174
coffee-rails (4.2.2)
7275
coffee-script (>= 2.2.0)
7376
railties (>= 4.0.0)
7477
coffee-script (2.4.1)
7578
coffee-script-source
7679
execjs
7780
coffee-script-source (1.12.2)
78-
concurrent-ruby (1.1.5)
79-
crass (1.0.4)
81+
concurrent-ruby (1.1.6)
82+
crass (1.0.6)
8083
docsplit (0.7.6)
81-
erubi (1.8.0)
84+
erubi (1.9.0)
8285
execjs (2.7.0)
83-
ffi (1.10.0)
86+
ffi (1.12.2)
8487
globalid (0.4.2)
8588
activesupport (>= 4.2.0)
86-
highline (2.0.2)
87-
i18n (1.6.0)
89+
highline (2.0.3)
90+
i18n (1.8.2)
8891
concurrent-ruby (~> 1.0)
89-
jbuilder (2.9.1)
90-
activesupport (>= 4.2.0)
91-
jquery-rails (4.3.3)
92+
io-like (0.3.1)
93+
jbuilder (2.10.0)
94+
activesupport (>= 5.0.0)
95+
jquery-rails (4.4.0)
9296
rails-dom-testing (>= 1, < 3)
9397
railties (>= 4.2.0)
9498
thor (>= 0.14, < 2.0)
9599
listen (3.1.5)
96100
rb-fsevent (~> 0.9, >= 0.9.4)
97101
rb-inotify (~> 0.9, >= 0.9.7)
98102
ruby_dep (~> 1.2)
99-
loofah (2.2.3)
103+
loofah (2.5.0)
100104
crass (~> 1.0.2)
101105
nokogiri (>= 1.5.9)
102106
mail (2.7.1)
103107
mini_mime (>= 0.1.1)
104108
marcel (0.3.3)
105109
mimemagic (~> 0.3.2)
106-
method_source (0.9.2)
107-
mimemagic (0.3.3)
108-
mini_mime (1.0.1)
110+
method_source (1.0.0)
111+
mimemagic (0.3.5)
112+
mini_mime (1.0.2)
109113
mini_portile2 (2.4.0)
110-
minitest (5.11.3)
111-
msgpack (1.2.10)
112-
net-scp (2.0.0)
113-
net-ssh (>= 2.6.5, < 6.0.0)
114-
net-sftp (2.1.2)
115-
net-ssh (>= 2.6.5)
116-
net-ssh (5.2.0)
114+
minitest (5.14.1)
115+
msgpack (1.3.3)
116+
net-scp (3.0.0)
117+
net-ssh (>= 2.6.5, < 7.0.0)
118+
net-sftp (3.0.0)
119+
net-ssh (>= 5.0.0, < 7.0.0)
120+
net-ssh (6.0.2)
117121
net-ssh-gateway (2.0.0)
118122
net-ssh (>= 4.0.0)
119-
nio4r (2.3.1)
120-
nokogiri (1.10.5)
123+
nio4r (2.5.2)
124+
nokogiri (1.10.9)
121125
mini_portile2 (~> 2.4.0)
122-
public_suffix (3.0.3)
123-
puma (3.12.1)
124-
rack (2.0.7)
126+
public_suffix (4.0.5)
127+
puma (3.12.6)
128+
rack (2.2.2)
125129
rack-test (1.1.0)
126130
rack (>= 1.0, < 3)
127-
rails (5.2.3)
128-
actioncable (= 5.2.3)
129-
actionmailer (= 5.2.3)
130-
actionpack (= 5.2.3)
131-
actionview (= 5.2.3)
132-
activejob (= 5.2.3)
133-
activemodel (= 5.2.3)
134-
activerecord (= 5.2.3)
135-
activestorage (= 5.2.3)
136-
activesupport (= 5.2.3)
131+
rails (5.2.4.3)
132+
actioncable (= 5.2.4.3)
133+
actionmailer (= 5.2.4.3)
134+
actionpack (= 5.2.4.3)
135+
actionview (= 5.2.4.3)
136+
activejob (= 5.2.4.3)
137+
activemodel (= 5.2.4.3)
138+
activerecord (= 5.2.4.3)
139+
activestorage (= 5.2.4.3)
140+
activesupport (= 5.2.4.3)
137141
bundler (>= 1.3.0)
138-
railties (= 5.2.3)
142+
railties (= 5.2.4.3)
139143
sprockets-rails (>= 2.0.0)
140-
rails-controller-testing (1.0.2)
141-
actionpack (~> 5.x, >= 5.0.1)
142-
actionview (~> 5.x, >= 5.0.1)
143-
activesupport (~> 5.x)
144+
rails-controller-testing (1.0.4)
145+
actionpack (>= 5.0.1.x)
146+
actionview (>= 5.0.1.x)
147+
activesupport (>= 5.0.1.x)
144148
rails-dom-testing (2.0.3)
145149
activesupport (>= 4.2.0)
146150
nokogiri (>= 1.6)
147-
rails-html-sanitizer (1.0.4)
148-
loofah (~> 2.2, >= 2.2.2)
149-
railties (5.2.3)
150-
actionpack (= 5.2.3)
151-
activesupport (= 5.2.3)
151+
rails-html-sanitizer (1.3.0)
152+
loofah (~> 2.3)
153+
railties (5.2.4.3)
154+
actionpack (= 5.2.4.3)
155+
activesupport (= 5.2.4.3)
152156
method_source
153157
rake (>= 0.8.7)
154158
thor (>= 0.19.0, < 2.0)
155-
rake (12.3.2)
156-
rb-fsevent (0.10.3)
157-
rb-inotify (0.10.0)
159+
rake (13.0.1)
160+
rb-fsevent (0.10.4)
161+
rb-inotify (0.10.1)
158162
ffi (~> 1.0)
159-
regexp_parser (1.5.0)
163+
regexp_parser (1.7.0)
160164
ruby_dep (1.5.0)
161-
rubyzip (1.3.0)
165+
rubyzip (2.3.0)
162166
sass (3.7.4)
163167
sass-listen (~> 4.0.0)
164168
sass-listen (4.0.0)
165169
rb-fsevent (~> 0.9, >= 0.9.4)
166170
rb-inotify (~> 0.9, >= 0.9.7)
167-
sass-rails (5.0.7)
168-
railties (>= 4.0.0, < 6)
171+
sass-rails (5.1.0)
172+
railties (>= 5.2.0)
169173
sass (~> 3.1)
170174
sprockets (>= 2.8, < 4.0)
171175
sprockets-rails (>= 2.0, < 4.0)
172176
tilt (>= 1.1, < 3)
173-
selenium-webdriver (3.142.2)
174-
childprocess (>= 0.5, < 2.0)
175-
rubyzip (~> 1.2, >= 1.2.2)
176-
spring (2.0.2)
177-
activesupport (>= 4.2)
177+
selenium-webdriver (3.142.7)
178+
childprocess (>= 0.5, < 4.0)
179+
rubyzip (>= 1.2.2)
180+
spring (2.1.0)
178181
spring-watcher-listen (2.0.1)
179182
listen (>= 2.7, < 4.0)
180183
spring (>= 1.2, < 3.0)
@@ -185,30 +188,26 @@ GEM
185188
actionpack (>= 4.0)
186189
activesupport (>= 4.0)
187190
sprockets (>= 3.0.0)
188-
sqlite3 (1.4.1)
191+
sqlite3 (1.4.2)
189192
statsd-ruby (1.2.1)
190-
thor (0.20.3)
193+
thor (1.0.1)
191194
thread_safe (0.3.6)
192-
tilt (2.0.9)
193-
turbolinks (5.2.0)
195+
tilt (2.0.10)
196+
turbolinks (5.2.1)
194197
turbolinks-source (~> 5.2)
195198
turbolinks-source (5.2.0)
196-
tzinfo (1.2.5)
199+
tzinfo (1.2.7)
197200
thread_safe (~> 0.1)
198-
uglifier (4.1.20)
201+
uglifier (4.2.0)
199202
execjs (>= 0.3.0, < 3)
200203
web-console (3.7.0)
201204
actionview (>= 5.0)
202205
activemodel (>= 5.0)
203206
bindex (>= 0.4.0)
204207
railties (>= 5.0)
205-
webdrivers (3.9.2)
206-
nokogiri (~> 1.6)
207-
rubyzip (~> 1.0)
208-
selenium-webdriver (~> 3.0)
209-
websocket-driver (0.7.0)
208+
websocket-driver (0.7.2)
210209
websocket-extensions (>= 0.1.0)
211-
websocket-extensions (0.1.3)
210+
websocket-extensions (0.1.4)
212211
xpath (3.2.0)
213212
nokogiri (~> 1.8)
214213

@@ -221,13 +220,14 @@ DEPENDENCIES
221220
byebug
222221
capistrano (~> 2.14.2)
223222
capybara (>= 2.15)
223+
chromedriver-helper
224224
coffee-rails (~> 4.2)
225225
docsplit (~> 0.7.2)
226226
jbuilder (~> 2.5)
227227
jquery-rails
228228
listen (>= 3.0.5, < 3.2)
229229
puma (~> 3.11)
230-
rails (~> 5.2.3)
230+
rails (~> 5.2.4, >= 5.2.4.3)
231231
rails-controller-testing
232232
sass-rails (~> 5.0)
233233
selenium-webdriver
@@ -239,7 +239,6 @@ DEPENDENCIES
239239
tzinfo-data
240240
uglifier (>= 1.3.0)
241241
web-console (>= 3.3.0)
242-
webdrivers (~> 3.0)
243242

244243
RUBY VERSION
245244
ruby 2.6.3p62

bin/setup

-8
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,6 @@ chdir APP_ROOT do
2020
# Install JavaScript dependencies if using Yarn
2121
# system('bin/yarn')
2222

23-
# puts "\n== Copying sample files =="
24-
# unless File.exist?('config/database.yml')
25-
# cp 'config/database.yml.sample', 'config/database.yml'
26-
# end
27-
28-
puts "\n== Preparing database =="
29-
system! 'bin/rails db:setup'
30-
3123
puts "\n== Removing old logs and tempfiles =="
3224
system! 'bin/rails log:clear tmp:clear'
3325

bin/update

-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ chdir APP_ROOT do
2020
# Install JavaScript dependencies if using Yarn
2121
# system('bin/yarn')
2222

23-
puts "\n== Updating database =="
24-
system! 'bin/rails db:migrate'
25-
2623
puts "\n== Removing old logs and tempfiles =="
2724
system! 'bin/rails log:clear tmp:clear'
2825

0 commit comments

Comments
 (0)