Skip to content

Commit 86e631b

Browse files
committed
Rails master + preliminary Zeitwerk integration
1 parent dde03e7 commit 86e631b

File tree

2 files changed

+42
-27
lines changed

2 files changed

+42
-27
lines changed

Gemfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ ruby '2.5.3'
33
source 'https://rubygems.org'
44
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55

6-
gem 'rails', '~> 6.0.0.beta1'
6+
gem 'rails', git: 'https://github.com/rails/rails.git', branch: 'fxn/zeitwerk'
7+
gem 'zeitwerk', git: 'https://github.com/fxn/zeitwerk.git', branch: 'master'
78
gem 'pg'
89
gem 'puma', '~> 3.11'
910
gem 'rugged', '0.27.0'

Gemfile.lock

+40-26
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
GEM
2-
remote: https://rubygems.org/
1+
GIT
2+
remote: https://github.com/fxn/zeitwerk.git
3+
revision: 85968ca1ee8a2baf391d6a14b4cf907ba9a6f533
4+
branch: master
5+
specs:
6+
zeitwerk (1.0.0.beta2)
7+
8+
GIT
9+
remote: https://github.com/rails/rails.git
10+
revision: 3c59ec0643d85ec6d646e1ed01492147be7bbb60
11+
branch: fxn/zeitwerk
312
specs:
413
actioncable (6.0.0.beta1)
514
actionpack (= 6.0.0.beta1)
@@ -25,8 +34,6 @@ GEM
2534
rack-test (>= 0.6.3)
2635
rails-dom-testing (~> 2.0)
2736
rails-html-sanitizer (~> 1.0, >= 1.0.2)
28-
actionpack-page_caching (1.1.1)
29-
actionpack (>= 4.0.0, < 6)
3037
actiontext (6.0.0.beta1)
3138
actionpack (= 6.0.0.beta1)
3239
activerecord (= 6.0.0.beta1)
@@ -56,6 +63,33 @@ GEM
5663
i18n (>= 0.7, < 2)
5764
minitest (~> 5.1)
5865
tzinfo (~> 1.1)
66+
rails (6.0.0.beta1)
67+
actioncable (= 6.0.0.beta1)
68+
actionmailbox (= 6.0.0.beta1)
69+
actionmailer (= 6.0.0.beta1)
70+
actionpack (= 6.0.0.beta1)
71+
actiontext (= 6.0.0.beta1)
72+
actionview (= 6.0.0.beta1)
73+
activejob (= 6.0.0.beta1)
74+
activemodel (= 6.0.0.beta1)
75+
activerecord (= 6.0.0.beta1)
76+
activestorage (= 6.0.0.beta1)
77+
activesupport (= 6.0.0.beta1)
78+
bundler (>= 1.3.0)
79+
railties (= 6.0.0.beta1)
80+
sprockets-rails (>= 2.0.0)
81+
railties (6.0.0.beta1)
82+
actionpack (= 6.0.0.beta1)
83+
activesupport (= 6.0.0.beta1)
84+
method_source
85+
rake (>= 0.8.7)
86+
thor (>= 0.20.3, < 2.0)
87+
88+
GEM
89+
remote: https://rubygems.org/
90+
specs:
91+
actionpack-page_caching (1.1.1)
92+
actionpack (>= 4.0.0, < 6)
5993
airbrussh (1.3.1)
6094
sshkit (>= 1.6.1, != 1.7.0)
6195
bcrypt_pbkdf (1.0.0)
@@ -123,21 +157,6 @@ GEM
123157
rack (2.0.6)
124158
rack-test (1.1.0)
125159
rack (>= 1.0, < 3)
126-
rails (6.0.0.beta1)
127-
actioncable (= 6.0.0.beta1)
128-
actionmailbox (= 6.0.0.beta1)
129-
actionmailer (= 6.0.0.beta1)
130-
actionpack (= 6.0.0.beta1)
131-
actiontext (= 6.0.0.beta1)
132-
actionview (= 6.0.0.beta1)
133-
activejob (= 6.0.0.beta1)
134-
activemodel (= 6.0.0.beta1)
135-
activerecord (= 6.0.0.beta1)
136-
activestorage (= 6.0.0.beta1)
137-
activesupport (= 6.0.0.beta1)
138-
bundler (>= 1.3.0)
139-
railties (= 6.0.0.beta1)
140-
sprockets-rails (>= 2.0.0)
141160
rails-controller-testing (1.0.4)
142161
actionpack (>= 5.0.1.x)
143162
actionview (>= 5.0.1.x)
@@ -147,12 +166,6 @@ GEM
147166
nokogiri (>= 1.6)
148167
rails-html-sanitizer (1.0.4)
149168
loofah (~> 2.2, >= 2.2.2)
150-
railties (6.0.0.beta1)
151-
actionpack (= 6.0.0.beta1)
152-
activesupport (= 6.0.0.beta1)
153-
method_source
154-
rake (>= 0.8.7)
155-
thor (>= 0.20.3, < 2.0)
156169
rake (12.3.2)
157170
rb-fsevent (0.10.3)
158171
rb-inotify (0.10.0)
@@ -222,7 +235,7 @@ DEPENDENCIES
222235
listen (>= 3.0.5, < 3.2)
223236
pg
224237
puma (~> 3.11)
225-
rails (~> 6.0.0.beta1)
238+
rails!
226239
rails-controller-testing
227240
rbnacl (>= 3.2, < 5.0)
228241
rbnacl-libsodium
@@ -232,6 +245,7 @@ DEPENDENCIES
232245
uglifier (>= 1.3.0)
233246
unf
234247
web-console (>= 3.3.0)
248+
zeitwerk!
235249

236250
RUBY VERSION
237251
ruby 2.5.3p105

0 commit comments

Comments
 (0)