Skip to content

Commit 4f4572e

Browse files
committed
pin to rails 6.0.0.rc1
1 parent aa24879 commit 4f4572e

File tree

5 files changed

+59
-56
lines changed

5 files changed

+59
-56
lines changed

Gemfile.lock

Lines changed: 55 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -3,68 +3,69 @@ PATH
33
specs:
44
form_core (0.1.1)
55
activeentity (>= 0.0.1.beta5)
6-
rails (>= 6.0.0.beta3, < 7)
6+
rails (>= 6.0.0.rc1, < 7)
77

88
GEM
99
remote: https://rubygems.org/
1010
specs:
11-
actioncable (6.0.0.beta3)
12-
actionpack (= 6.0.0.beta3)
11+
actioncable (6.0.0.rc1)
12+
actionpack (= 6.0.0.rc1)
1313
nio4r (~> 2.0)
1414
websocket-driver (>= 0.6.1)
15-
actionmailbox (6.0.0.beta3)
16-
actionpack (= 6.0.0.beta3)
17-
activejob (= 6.0.0.beta3)
18-
activerecord (= 6.0.0.beta3)
19-
activestorage (= 6.0.0.beta3)
20-
activesupport (= 6.0.0.beta3)
15+
actionmailbox (6.0.0.rc1)
16+
actionpack (= 6.0.0.rc1)
17+
activejob (= 6.0.0.rc1)
18+
activerecord (= 6.0.0.rc1)
19+
activestorage (= 6.0.0.rc1)
20+
activesupport (= 6.0.0.rc1)
2121
mail (>= 2.7.1)
22-
actionmailer (6.0.0.beta3)
23-
actionpack (= 6.0.0.beta3)
24-
actionview (= 6.0.0.beta3)
25-
activejob (= 6.0.0.beta3)
22+
actionmailer (6.0.0.rc1)
23+
actionpack (= 6.0.0.rc1)
24+
actionview (= 6.0.0.rc1)
25+
activejob (= 6.0.0.rc1)
2626
mail (~> 2.5, >= 2.5.4)
2727
rails-dom-testing (~> 2.0)
28-
actionpack (6.0.0.beta3)
29-
actionview (= 6.0.0.beta3)
30-
activesupport (= 6.0.0.beta3)
28+
actionpack (6.0.0.rc1)
29+
actionview (= 6.0.0.rc1)
30+
activesupport (= 6.0.0.rc1)
3131
rack (~> 2.0)
3232
rack-test (>= 0.6.3)
3333
rails-dom-testing (~> 2.0)
3434
rails-html-sanitizer (~> 1.0, >= 1.0.2)
35-
actiontext (6.0.0.beta3)
36-
actionpack (= 6.0.0.beta3)
37-
activerecord (= 6.0.0.beta3)
38-
activestorage (= 6.0.0.beta3)
39-
activesupport (= 6.0.0.beta3)
35+
actiontext (6.0.0.rc1)
36+
actionpack (= 6.0.0.rc1)
37+
activerecord (= 6.0.0.rc1)
38+
activestorage (= 6.0.0.rc1)
39+
activesupport (= 6.0.0.rc1)
4040
nokogiri (>= 1.8.5)
41-
actionview (6.0.0.beta3)
42-
activesupport (= 6.0.0.beta3)
41+
actionview (6.0.0.rc1)
42+
activesupport (= 6.0.0.rc1)
4343
builder (~> 3.1)
4444
erubi (~> 1.4)
4545
rails-dom-testing (~> 2.0)
4646
rails-html-sanitizer (~> 1.0, >= 1.0.3)
4747
activeentity (0.0.1.beta5)
4848
activemodel (>= 6.0.0.beta3, < 7.0)
4949
activesupport (>= 6.0.0.beta3, < 7.0)
50-
activejob (6.0.0.beta3)
51-
activesupport (= 6.0.0.beta3)
50+
activejob (6.0.0.rc1)
51+
activesupport (= 6.0.0.rc1)
5252
globalid (>= 0.3.6)
53-
activemodel (6.0.0.beta3)
54-
activesupport (= 6.0.0.beta3)
55-
activerecord (6.0.0.beta3)
56-
activemodel (= 6.0.0.beta3)
57-
activesupport (= 6.0.0.beta3)
58-
activestorage (6.0.0.beta3)
59-
actionpack (= 6.0.0.beta3)
60-
activerecord (= 6.0.0.beta3)
53+
activemodel (6.0.0.rc1)
54+
activesupport (= 6.0.0.rc1)
55+
activerecord (6.0.0.rc1)
56+
activemodel (= 6.0.0.rc1)
57+
activesupport (= 6.0.0.rc1)
58+
activestorage (6.0.0.rc1)
59+
actionpack (= 6.0.0.rc1)
60+
activejob (= 6.0.0.rc1)
61+
activerecord (= 6.0.0.rc1)
6162
marcel (~> 0.3.1)
62-
activesupport (6.0.0.beta3)
63+
activesupport (6.0.0.rc1)
6364
concurrent-ruby (~> 1.0, >= 1.0.2)
6465
i18n (>= 0.7, < 2)
6566
minitest (~> 5.1)
6667
tzinfo (~> 1.1)
67-
zeitwerk (~> 1.3, >= 1.3.1)
68+
zeitwerk (~> 2.1, >= 2.1.4)
6869
acts_as_list (0.9.19)
6970
activerecord (>= 3.0)
7071
ast (2.4.0)
@@ -117,7 +118,7 @@ GEM
117118
mini_portile2 (2.4.0)
118119
minitest (5.11.3)
119120
nio4r (2.3.1)
120-
nokogiri (1.10.2)
121+
nokogiri (1.10.3)
121122
mini_portile2 (~> 2.4.0)
122123
parallel (1.17.0)
123124
parser (2.6.2.1)
@@ -135,29 +136,29 @@ GEM
135136
rack (2.0.7)
136137
rack-test (1.1.0)
137138
rack (>= 1.0, < 3)
138-
rails (6.0.0.beta3)
139-
actioncable (= 6.0.0.beta3)
140-
actionmailbox (= 6.0.0.beta3)
141-
actionmailer (= 6.0.0.beta3)
142-
actionpack (= 6.0.0.beta3)
143-
actiontext (= 6.0.0.beta3)
144-
actionview (= 6.0.0.beta3)
145-
activejob (= 6.0.0.beta3)
146-
activemodel (= 6.0.0.beta3)
147-
activerecord (= 6.0.0.beta3)
148-
activestorage (= 6.0.0.beta3)
149-
activesupport (= 6.0.0.beta3)
139+
rails (6.0.0.rc1)
140+
actioncable (= 6.0.0.rc1)
141+
actionmailbox (= 6.0.0.rc1)
142+
actionmailer (= 6.0.0.rc1)
143+
actionpack (= 6.0.0.rc1)
144+
actiontext (= 6.0.0.rc1)
145+
actionview (= 6.0.0.rc1)
146+
activejob (= 6.0.0.rc1)
147+
activemodel (= 6.0.0.rc1)
148+
activerecord (= 6.0.0.rc1)
149+
activestorage (= 6.0.0.rc1)
150+
activesupport (= 6.0.0.rc1)
150151
bundler (>= 1.3.0)
151-
railties (= 6.0.0.beta3)
152+
railties (= 6.0.0.rc1)
152153
sprockets-rails (>= 2.0.0)
153154
rails-dom-testing (2.0.3)
154155
activesupport (>= 4.2.0)
155156
nokogiri (>= 1.6)
156157
rails-html-sanitizer (1.0.4)
157158
loofah (~> 2.2, >= 2.2.2)
158-
railties (6.0.0.beta3)
159-
actionpack (= 6.0.0.beta3)
160-
activesupport (= 6.0.0.beta3)
159+
railties (6.0.0.rc1)
160+
actionpack (= 6.0.0.rc1)
161+
activesupport (= 6.0.0.rc1)
161162
method_source
162163
rake (>= 0.8.7)
163164
thor (>= 0.20.3, < 2.0)
@@ -189,7 +190,7 @@ GEM
189190
sassc (2.0.1)
190191
ffi (~> 1.9)
191192
rake
192-
sassc-rails (2.1.0)
193+
sassc-rails (2.1.1)
193194
railties (>= 4.0.0)
194195
sassc (>= 2.0)
195196
sprockets (> 3.0)
@@ -229,7 +230,7 @@ GEM
229230
websocket-driver (0.7.0)
230231
websocket-extensions (>= 0.1.0)
231232
websocket-extensions (0.1.3)
232-
zeitwerk (1.4.3)
233+
zeitwerk (2.1.5)
233234

234235
PLATFORMS
235236
ruby

form_core.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
2222
s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
2323

2424
s.add_dependency "activeentity", ">= 0.0.1.beta5"
25-
s.add_dependency "rails", ">= 6.0.0.beta3", "< 7"
25+
s.add_dependency "rails", ">= 6.0.0.rc1", "< 7"
2626
end

test/dummy/config/application.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ class Application < Rails::Application
3131
# Application configuration should go into files in config/initializers
3232
# -- all .rb files in that directory are automatically loaded.
3333

34+
Rails.autoloaders.main.ignore("#{Rails.root}/app/overrides")
35+
3436
config.to_prepare do
35-
Dir.glob(Rails.root + "app/decorators/**/*_decorator*.rb").each do |c|
37+
Dir.glob(Rails.root + "app/overrides/**/*_override*.rb").each do |c|
3638
require_dependency(c)
3739
end
3840
end

0 commit comments

Comments
 (0)