Skip to content

Commit 89a7cb4

Browse files
committed
Upgrade to Rails 6 beta2
And some other gems too...
1 parent 5c1d33c commit 89a7cb4

17 files changed

+183
-118
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
44
ruby '2.5.3'
55

66
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
7-
gem 'rails', '~> 5.2.1'
7+
gem 'rails', '6.0.0.beta2'
88
# Use postgresql as the database for Active Record
99
gem 'pg', '>= 0.18', '< 2.0'
1010
# Use Puma as the app server

Gemfile.lock

Lines changed: 80 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,71 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.2.1)
5-
actionpack (= 5.2.1)
4+
actioncable (6.0.0.beta2)
5+
actionpack (= 6.0.0.beta2)
66
nio4r (~> 2.0)
77
websocket-driver (>= 0.6.1)
8-
actionmailer (5.2.1)
9-
actionpack (= 5.2.1)
10-
actionview (= 5.2.1)
11-
activejob (= 5.2.1)
8+
actionmailbox (6.0.0.beta2)
9+
actionpack (= 6.0.0.beta2)
10+
activejob (= 6.0.0.beta2)
11+
activerecord (= 6.0.0.beta2)
12+
activestorage (= 6.0.0.beta2)
13+
activesupport (= 6.0.0.beta2)
14+
mail (>= 2.7.1)
15+
actionmailer (6.0.0.beta2)
16+
actionpack (= 6.0.0.beta2)
17+
actionview (= 6.0.0.beta2)
18+
activejob (= 6.0.0.beta2)
1219
mail (~> 2.5, >= 2.5.4)
1320
rails-dom-testing (~> 2.0)
14-
actionpack (5.2.1)
15-
actionview (= 5.2.1)
16-
activesupport (= 5.2.1)
21+
actionpack (6.0.0.beta2)
22+
actionview (= 6.0.0.beta2)
23+
activesupport (= 6.0.0.beta2)
1724
rack (~> 2.0)
1825
rack-test (>= 0.6.3)
1926
rails-dom-testing (~> 2.0)
2027
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.2.1)
22-
activesupport (= 5.2.1)
28+
actiontext (6.0.0.beta2)
29+
actionpack (= 6.0.0.beta2)
30+
activerecord (= 6.0.0.beta2)
31+
activestorage (= 6.0.0.beta2)
32+
activesupport (= 6.0.0.beta2)
33+
nokogiri (>= 1.8.5)
34+
actionview (6.0.0.beta2)
35+
activesupport (= 6.0.0.beta2)
2336
builder (~> 3.1)
2437
erubi (~> 1.4)
2538
rails-dom-testing (~> 2.0)
2639
rails-html-sanitizer (~> 1.0, >= 1.0.3)
27-
activejob (5.2.1)
28-
activesupport (= 5.2.1)
40+
activejob (6.0.0.beta2)
41+
activesupport (= 6.0.0.beta2)
2942
globalid (>= 0.3.6)
30-
activemodel (5.2.1)
31-
activesupport (= 5.2.1)
32-
activerecord (5.2.1)
33-
activemodel (= 5.2.1)
34-
activesupport (= 5.2.1)
35-
arel (>= 9.0)
36-
activestorage (5.2.1)
37-
actionpack (= 5.2.1)
38-
activerecord (= 5.2.1)
43+
activemodel (6.0.0.beta2)
44+
activesupport (= 6.0.0.beta2)
45+
activerecord (6.0.0.beta2)
46+
activemodel (= 6.0.0.beta2)
47+
activesupport (= 6.0.0.beta2)
48+
activestorage (6.0.0.beta2)
49+
actionpack (= 6.0.0.beta2)
50+
activerecord (= 6.0.0.beta2)
3951
marcel (~> 0.3.1)
40-
activesupport (5.2.1)
52+
activesupport (6.0.0.beta2)
4153
concurrent-ruby (~> 1.0, >= 1.0.2)
4254
i18n (>= 0.7, < 2)
4355
minitest (~> 5.1)
4456
tzinfo (~> 1.1)
45-
addressable (2.5.2)
57+
zeitwerk (~> 1.3, >= 1.3.1)
58+
addressable (2.6.0)
4659
public_suffix (>= 2.0.2, < 4.0)
4760
archive-zip (0.11.0)
4861
io-like (~> 0.3.0)
49-
arel (9.0.0)
5062
bcrypt (3.1.12)
5163
bindex (0.5.0)
52-
bootsnap (1.3.2)
64+
bootsnap (1.4.1)
5365
msgpack (~> 1.0)
5466
builder (3.2.3)
55-
byebug (10.0.2)
56-
capybara (3.10.0)
67+
byebug (11.0.0)
68+
capybara (3.14.0)
5769
addressable
5870
mini_mime (>= 0.1.3)
5971
nokogiri (~> 1.8)
@@ -66,85 +78,84 @@ GEM
6678
chromedriver-helper (2.1.0)
6779
archive-zip (~> 0.10)
6880
nokogiri (~> 1.8)
69-
concurrent-ruby (1.0.5)
70-
countries (2.1.4)
81+
concurrent-ruby (1.1.4)
82+
countries (3.0.0)
7183
i18n_data (~> 0.8.0)
72-
money (~> 6.9)
7384
sixarm_ruby_unaccent (~> 1.1)
7485
unicode_utils (~> 1.4)
7586
crass (1.0.4)
76-
erubi (1.7.1)
87+
erubi (1.8.0)
7788
execjs (2.7.0)
78-
ffi (1.9.25)
79-
globalid (0.4.1)
89+
ffi (1.10.0)
90+
globalid (0.4.2)
8091
activesupport (>= 4.2.0)
81-
i18n (1.1.1)
92+
i18n (1.5.3)
8293
concurrent-ruby (~> 1.0)
8394
i18n_data (0.8.0)
8495
io-like (0.3.0)
85-
jbuilder (2.7.0)
96+
jbuilder (2.8.0)
8697
activesupport (>= 4.2.0)
8798
multi_json (>= 1.2)
8899
listen (3.1.5)
89100
rb-fsevent (~> 0.9, >= 0.9.4)
90101
rb-inotify (~> 0.9, >= 0.9.7)
91102
ruby_dep (~> 1.2)
92-
loofah (2.2.2)
103+
loofah (2.2.3)
93104
crass (~> 1.0.2)
94105
nokogiri (>= 1.5.9)
95106
mail (2.7.1)
96107
mini_mime (>= 0.1.1)
97108
marcel (0.3.3)
98109
mimemagic (~> 0.3.2)
99-
method_source (0.9.0)
100-
mimemagic (0.3.2)
110+
method_source (0.9.2)
111+
mimemagic (0.3.3)
101112
mini_mime (1.0.1)
102-
mini_portile2 (2.3.0)
113+
mini_portile2 (2.4.0)
103114
minitest (5.11.3)
104115
minitest-focus (1.1.2)
105116
minitest (>= 4, < 6)
106-
money (6.13.1)
107-
i18n (>= 0.6.4, <= 2)
108-
msgpack (1.2.4)
117+
msgpack (1.2.7)
109118
multi_json (1.13.1)
110119
nio4r (2.3.1)
111-
nokogiri (1.8.5)
112-
mini_portile2 (~> 2.3.0)
113-
pg (1.1.3)
120+
nokogiri (1.10.1)
121+
mini_portile2 (~> 2.4.0)
122+
pg (1.1.4)
114123
public_suffix (3.0.3)
115124
puma (3.12.0)
116-
rack (2.0.5)
125+
rack (2.0.6)
117126
rack-test (1.1.0)
118127
rack (>= 1.0, < 3)
119-
rails (5.2.1)
120-
actioncable (= 5.2.1)
121-
actionmailer (= 5.2.1)
122-
actionpack (= 5.2.1)
123-
actionview (= 5.2.1)
124-
activejob (= 5.2.1)
125-
activemodel (= 5.2.1)
126-
activerecord (= 5.2.1)
127-
activestorage (= 5.2.1)
128-
activesupport (= 5.2.1)
128+
rails (6.0.0.beta2)
129+
actioncable (= 6.0.0.beta2)
130+
actionmailbox (= 6.0.0.beta2)
131+
actionmailer (= 6.0.0.beta2)
132+
actionpack (= 6.0.0.beta2)
133+
actiontext (= 6.0.0.beta2)
134+
actionview (= 6.0.0.beta2)
135+
activejob (= 6.0.0.beta2)
136+
activemodel (= 6.0.0.beta2)
137+
activerecord (= 6.0.0.beta2)
138+
activestorage (= 6.0.0.beta2)
139+
activesupport (= 6.0.0.beta2)
129140
bundler (>= 1.3.0)
130-
railties (= 5.2.1)
141+
railties (= 6.0.0.beta2)
131142
sprockets-rails (>= 2.0.0)
132143
rails-dom-testing (2.0.3)
133144
activesupport (>= 4.2.0)
134145
nokogiri (>= 1.6)
135146
rails-html-sanitizer (1.0.4)
136147
loofah (~> 2.2, >= 2.2.2)
137-
railties (5.2.1)
138-
actionpack (= 5.2.1)
139-
activesupport (= 5.2.1)
148+
railties (6.0.0.beta2)
149+
actionpack (= 6.0.0.beta2)
150+
activesupport (= 6.0.0.beta2)
140151
method_source
141152
rake (>= 0.8.7)
142-
thor (>= 0.19.0, < 2.0)
143-
rake (12.3.1)
153+
thor (>= 0.20.3, < 2.0)
154+
rake (12.3.2)
144155
rb-fsevent (0.10.3)
145156
rb-inotify (0.9.10)
146157
ffi (>= 0.5.0, < 2)
147-
regexp_parser (1.2.0)
158+
regexp_parser (1.3.0)
148159
ruby_dep (1.5.0)
149160
rubyzip (1.2.2)
150161
sass (3.6.0)
@@ -158,7 +169,7 @@ GEM
158169
sprockets (>= 2.8, < 4.0)
159170
sprockets-rails (>= 2.0, < 4.0)
160171
tilt (>= 1.1, < 3)
161-
selenium-webdriver (3.14.1)
172+
selenium-webdriver (3.141.0)
162173
childprocess (~> 0.5)
163174
rubyzip (~> 1.2, >= 1.2.2)
164175
sixarm_ruby_unaccent (1.2.0)
@@ -174,15 +185,15 @@ GEM
174185
actionpack (>= 4.0)
175186
activesupport (>= 4.0)
176187
sprockets (>= 3.0.0)
177-
thor (0.20.0)
188+
thor (0.20.3)
178189
thread_safe (0.3.6)
179190
tilt (2.0.8)
180191
turbolinks (5.2.0)
181192
turbolinks-source (~> 5.2)
182193
turbolinks-source (5.2.0)
183194
tzinfo (1.2.5)
184195
thread_safe (~> 0.1)
185-
uglifier (4.1.19)
196+
uglifier (4.1.20)
186197
execjs (>= 0.3.0, < 3)
187198
unicode_utils (1.4.0)
188199
web-console (3.7.0)
@@ -195,6 +206,7 @@ GEM
195206
websocket-extensions (0.1.3)
196207
xpath (3.2.0)
197208
nokogiri (~> 1.8)
209+
zeitwerk (1.3.1)
198210

199211
PLATFORMS
200212
ruby
@@ -211,7 +223,7 @@ DEPENDENCIES
211223
minitest-focus
212224
pg (>= 0.18, < 2.0)
213225
puma (~> 3.11)
214-
rails (~> 5.2.1)
226+
rails (= 6.0.0.beta2)
215227
sass-rails (~> 5.0)
216228
selenium-webdriver
217229
spring

bin/rails

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
#!/usr/bin/env ruby
2-
begin
3-
load File.expand_path('../spring', __FILE__)
4-
rescue LoadError => e
5-
raise unless e.message.include?('spring')
6-
end
72
APP_PATH = File.expand_path('../config/application', __dir__)
83
require_relative '../config/boot'
94
require 'rails/commands'

bin/rake

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
#!/usr/bin/env ruby
2-
begin
3-
load File.expand_path('../spring', __FILE__)
4-
rescue LoadError => e
5-
raise unless e.message.include?('spring')
6-
end
72
require_relative '../config/boot'
83
require 'rake'
94
Rake.application.run

bin/setup

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/usr/bin/env ruby
22
require 'fileutils'
3-
include FileUtils
43

54
# path to your application root.
65
APP_ROOT = File.expand_path('..', __dir__)
@@ -9,20 +8,20 @@ def system!(*args)
98
system(*args) || abort("\n== Command #{args} failed ==")
109
end
1110

12-
chdir APP_ROOT do
11+
FileUtils.chdir APP_ROOT do
1312
# This script is a starting point to setup your application.
1413
# Add necessary setup steps to this file.
1514

1615
puts '== Installing dependencies =='
1716
system! 'gem install bundler --conservative'
1817
system('bundle check') || system!('bundle install')
1918

20-
# Install JavaScript dependencies if using Yarn
19+
# Install JavaScript dependencies
2120
# system('bin/yarn')
2221

2322
# puts "\n== Copying sample files =="
2423
# unless File.exist?('config/database.yml')
25-
# cp 'config/database.yml.sample', 'config/database.yml'
24+
# FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
2625
# end
2726

2827
puts "\n== Preparing database =="

bin/update

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/usr/bin/env ruby
22
require 'fileutils'
3-
include FileUtils
43

54
# path to your application root.
65
APP_ROOT = File.expand_path('..', __dir__)
@@ -9,23 +8,23 @@ def system!(*args)
98
system(*args) || abort("\n== Command #{args} failed ==")
109
end
1110

12-
chdir APP_ROOT do
11+
FileUtils.chdir APP_ROOT do
1312
# This script is a way to update your development environment automatically.
1413
# Add necessary update steps to this file.
1514

1615
puts '== Installing dependencies =='
1716
system! 'gem install bundler --conservative'
1817
system('bundle check') || system!('bundle install')
1918

20-
# Install JavaScript dependencies if using Yarn
19+
# Install JavaScript dependencies
2120
# system('bin/yarn')
2221

2322
puts "\n== Updating database =="
24-
system! 'bin/rails db:migrate'
23+
system! 'rails db:migrate'
2524

2625
puts "\n== Removing old logs and tempfiles =="
27-
system! 'bin/rails log:clear tmp:clear'
26+
system! 'rails log:clear tmp:clear'
2827

2928
puts "\n== Restarting application server =="
30-
system! 'bin/rails restart'
29+
system! 'rails restart'
3130
end

config/cable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ development:
22
adapter: async
33

44
test:
5-
adapter: async
5+
adapter: test
66

77
production:
88
adapter: redis

config/environments/development.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
# Run rails dev:cache to toggle caching.
1717
if Rails.root.join('tmp', 'caching-dev.txt').exist?
1818
config.action_controller.perform_caching = true
19+
config.action_controller.enable_fragment_cache_logging = true
1920

2021
config.cache_store = :memory_store
2122
config.public_file_server.headers = {
@@ -27,7 +28,7 @@
2728
config.cache_store = :null_store
2829
end
2930

30-
# Store uploaded files on the local file system (see config/storage.yml for options)
31+
# Store uploaded files on the local file system (see config/storage.yml for options).
3132
config.active_storage.service = :local
3233

3334
# Don't care if the mailer can't send.
@@ -54,7 +55,7 @@
5455
# Suppress logger output for asset requests.
5556
config.assets.quiet = true
5657

57-
# Raises error for missing translations
58+
# Raises error for missing translations.
5859
# config.action_view.raise_on_missing_translations = true
5960

6061
# Use an evented file watcher to asynchronously detect changes in source code,

0 commit comments

Comments
 (0)