Skip to content

Commit de0b3e5

Browse files
committed
Add Rails 6.1 support
1 parent 63a4cb2 commit de0b3e5

File tree

3 files changed

+116
-76
lines changed

3 files changed

+116
-76
lines changed

Gemfile.lock

Lines changed: 96 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -2,99 +2,126 @@ PATH
22
remote: .
33
specs:
44
lab_tech (0.1.8)
5-
rails (>= 5.1.0, < 6.1.0)
5+
rails (>= 5.1.0, < 7.0)
66
scientist (~> 1.3)
77

88
GEM
99
remote: https://rubygems.org/
1010
specs:
11-
actioncable (5.1.7)
12-
actionpack (= 5.1.7)
11+
actioncable (6.1.4.1)
12+
actionpack (= 6.1.4.1)
13+
activesupport (= 6.1.4.1)
1314
nio4r (~> 2.0)
14-
websocket-driver (~> 0.6.1)
15-
actionmailer (5.1.7)
16-
actionpack (= 5.1.7)
17-
actionview (= 5.1.7)
18-
activejob (= 5.1.7)
15+
websocket-driver (>= 0.6.1)
16+
actionmailbox (6.1.4.1)
17+
actionpack (= 6.1.4.1)
18+
activejob (= 6.1.4.1)
19+
activerecord (= 6.1.4.1)
20+
activestorage (= 6.1.4.1)
21+
activesupport (= 6.1.4.1)
22+
mail (>= 2.7.1)
23+
actionmailer (6.1.4.1)
24+
actionpack (= 6.1.4.1)
25+
actionview (= 6.1.4.1)
26+
activejob (= 6.1.4.1)
27+
activesupport (= 6.1.4.1)
1928
mail (~> 2.5, >= 2.5.4)
2029
rails-dom-testing (~> 2.0)
21-
actionpack (5.1.7)
22-
actionview (= 5.1.7)
23-
activesupport (= 5.1.7)
24-
rack (~> 2.0)
30+
actionpack (6.1.4.1)
31+
actionview (= 6.1.4.1)
32+
activesupport (= 6.1.4.1)
33+
rack (~> 2.0, >= 2.0.9)
2534
rack-test (>= 0.6.3)
2635
rails-dom-testing (~> 2.0)
27-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
28-
actionview (5.1.7)
29-
activesupport (= 5.1.7)
36+
rails-html-sanitizer (~> 1.0, >= 1.2.0)
37+
actiontext (6.1.4.1)
38+
actionpack (= 6.1.4.1)
39+
activerecord (= 6.1.4.1)
40+
activestorage (= 6.1.4.1)
41+
activesupport (= 6.1.4.1)
42+
nokogiri (>= 1.8.5)
43+
actionview (6.1.4.1)
44+
activesupport (= 6.1.4.1)
3045
builder (~> 3.1)
3146
erubi (~> 1.4)
3247
rails-dom-testing (~> 2.0)
33-
rails-html-sanitizer (~> 1.0, >= 1.0.3)
34-
activejob (5.1.7)
35-
activesupport (= 5.1.7)
48+
rails-html-sanitizer (~> 1.1, >= 1.2.0)
49+
activejob (6.1.4.1)
50+
activesupport (= 6.1.4.1)
3651
globalid (>= 0.3.6)
37-
activemodel (5.1.7)
38-
activesupport (= 5.1.7)
39-
activerecord (5.1.7)
40-
activemodel (= 5.1.7)
41-
activesupport (= 5.1.7)
42-
arel (~> 8.0)
43-
activesupport (5.1.7)
52+
activemodel (6.1.4.1)
53+
activesupport (= 6.1.4.1)
54+
activerecord (6.1.4.1)
55+
activemodel (= 6.1.4.1)
56+
activesupport (= 6.1.4.1)
57+
activestorage (6.1.4.1)
58+
actionpack (= 6.1.4.1)
59+
activejob (= 6.1.4.1)
60+
activerecord (= 6.1.4.1)
61+
activesupport (= 6.1.4.1)
62+
marcel (~> 1.0.0)
63+
mini_mime (>= 1.1.0)
64+
activesupport (6.1.4.1)
4465
concurrent-ruby (~> 1.0, >= 1.0.2)
45-
i18n (>= 0.7, < 2)
46-
minitest (~> 5.1)
47-
tzinfo (~> 1.1)
48-
arel (8.0.0)
66+
i18n (>= 1.6, < 2)
67+
minitest (>= 5.1)
68+
tzinfo (~> 2.0)
69+
zeitwerk (~> 2.3)
4970
awesome_print (1.8.0)
50-
builder (3.2.3)
51-
concurrent-ruby (1.1.5)
52-
crass (1.0.5)
71+
builder (3.2.4)
72+
concurrent-ruby (1.1.9)
73+
crass (1.0.6)
5374
diff-lcs (1.4.4)
54-
erubi (1.8.0)
55-
globalid (0.4.2)
56-
activesupport (>= 4.2.0)
57-
i18n (1.6.0)
75+
erubi (1.10.0)
76+
globalid (0.5.2)
77+
activesupport (>= 5.0)
78+
i18n (1.8.10)
5879
concurrent-ruby (~> 1.0)
59-
loofah (2.4.0)
80+
loofah (2.12.0)
6081
crass (~> 1.0.2)
6182
nokogiri (>= 1.5.9)
6283
mail (2.7.1)
6384
mini_mime (>= 0.1.1)
64-
method_source (0.9.2)
65-
mini_mime (1.0.2)
66-
mini_portile2 (2.4.0)
67-
minitest (5.11.3)
68-
nio4r (2.5.5)
69-
nokogiri (1.10.8)
70-
mini_portile2 (~> 2.4.0)
71-
rack (2.0.8)
85+
marcel (1.0.1)
86+
method_source (1.0.0)
87+
mini_mime (1.1.1)
88+
mini_portile2 (2.6.1)
89+
minitest (5.14.4)
90+
nio4r (2.5.8)
91+
nokogiri (1.12.3)
92+
mini_portile2 (~> 2.6.1)
93+
racc (~> 1.4)
94+
racc (1.5.2)
95+
rack (2.2.3)
7296
rack-test (1.1.0)
7397
rack (>= 1.0, < 3)
74-
rails (5.1.7)
75-
actioncable (= 5.1.7)
76-
actionmailer (= 5.1.7)
77-
actionpack (= 5.1.7)
78-
actionview (= 5.1.7)
79-
activejob (= 5.1.7)
80-
activemodel (= 5.1.7)
81-
activerecord (= 5.1.7)
82-
activesupport (= 5.1.7)
83-
bundler (>= 1.3.0)
84-
railties (= 5.1.7)
98+
rails (6.1.4.1)
99+
actioncable (= 6.1.4.1)
100+
actionmailbox (= 6.1.4.1)
101+
actionmailer (= 6.1.4.1)
102+
actionpack (= 6.1.4.1)
103+
actiontext (= 6.1.4.1)
104+
actionview (= 6.1.4.1)
105+
activejob (= 6.1.4.1)
106+
activemodel (= 6.1.4.1)
107+
activerecord (= 6.1.4.1)
108+
activestorage (= 6.1.4.1)
109+
activesupport (= 6.1.4.1)
110+
bundler (>= 1.15.0)
111+
railties (= 6.1.4.1)
85112
sprockets-rails (>= 2.0.0)
86113
rails-dom-testing (2.0.3)
87114
activesupport (>= 4.2.0)
88115
nokogiri (>= 1.6)
89-
rails-html-sanitizer (1.2.0)
90-
loofah (~> 2.2, >= 2.2.2)
91-
railties (5.1.7)
92-
actionpack (= 5.1.7)
93-
activesupport (= 5.1.7)
116+
rails-html-sanitizer (1.4.2)
117+
loofah (~> 2.3)
118+
railties (6.1.4.1)
119+
actionpack (= 6.1.4.1)
120+
activesupport (= 6.1.4.1)
94121
method_source
95-
rake (>= 0.8.7)
96-
thor (>= 0.18.1, < 2.0)
97-
rake (12.3.3)
122+
rake (>= 0.13)
123+
thor (~> 1.0)
124+
rake (13.0.6)
98125
rspec-core (3.10.1)
99126
rspec-support (~> 3.10.0)
100127
rspec-expectations (3.10.1)
@@ -122,13 +149,13 @@ GEM
122149
sprockets (>= 3.0.0)
123150
sqlite3 (1.4.1)
124151
table_print (1.5.6)
125-
thor (0.20.3)
126-
thread_safe (0.3.6)
127-
tzinfo (1.2.5)
128-
thread_safe (~> 0.1)
129-
websocket-driver (0.6.5)
152+
thor (1.1.0)
153+
tzinfo (2.0.4)
154+
concurrent-ruby (~> 1.0)
155+
websocket-driver (0.7.5)
130156
websocket-extensions (>= 0.1.0)
131157
websocket-extensions (0.1.5)
158+
zeitwerk (2.4.2)
132159

133160
PLATFORMS
134161
ruby

lab_tech.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
1717
spec.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
1818
spec.test_files = Dir["spec/**/*"]
1919

20-
spec.add_dependency "rails", ">= 5.1.0", "< 6.1.0"
20+
spec.add_dependency "rails", ">= 5.1.0", "< 7.0"
2121
spec.add_dependency "scientist", "~> 1.3"
2222

2323
spec.add_development_dependency "sqlite3"

spec/dummy/config/environments/test.rb

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
require "active_support/core_ext/integer/time"
2+
3+
# The test environment is used exclusively to run your application's
4+
# test suite. You never need to work with it otherwise. Remember that
5+
# your test database is "scratch space" for the test suite and is wiped
6+
# and recreated between test runs. Don't rely on the data there!
7+
18
Rails.application.configure do
29
# Settings specified here will take precedence over those in config/application.rb.
310

4-
# The test environment is used exclusively to run your application's
5-
# test suite. You never need to work with it otherwise. Remember that
6-
# your test database is "scratch space" for the test suite and is wiped
7-
# and recreated between test runs. Don't rely on the data there!
811
config.cache_classes = true
912

1013
# Do not eager load code on boot. This avoids loading your whole application
@@ -21,6 +24,7 @@
2124
# Show full error reports and disable caching.
2225
config.consider_all_requests_local = true
2326
config.action_controller.perform_caching = false
27+
config.cache_store = :null_store
2428

2529
# Raise exceptions instead of rendering exception templates.
2630
config.action_dispatch.show_exceptions = false
@@ -31,6 +35,15 @@
3135
# Print deprecation notices to the stderr.
3236
config.active_support.deprecation = :stderr
3337

34-
# Raises error for missing translations
35-
# config.action_view.raise_on_missing_translations = true
38+
# Raise exceptions for disallowed deprecations.
39+
config.active_support.disallowed_deprecation = :raise
40+
41+
# Tell Active Support which deprecation messages to disallow.
42+
config.active_support.disallowed_deprecation_warnings = []
43+
44+
# Raises error for missing translations.
45+
# config.i18n.raise_on_missing_translations = true
46+
47+
# Annotate rendered view with file names.
48+
# config.action_view.annotate_rendered_view_with_filenames = true
3649
end

0 commit comments

Comments
 (0)