Skip to content

Commit cd5e947

Browse files
committed
Merge pull request #416 from jashank/gemfile-rails-github
Use the ':git' source when bundling Rails master
2 parents 73c1137 + 1cd8d05 commit cd5e947

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

Gemfile

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ platforms :jruby do
1111
end
1212

1313
version = ENV['RAILS_VERSION'] || 'default'
14-
rails = case version
15-
when 'master'
16-
{ github: 'rails/rails' }
17-
when 'default'
18-
'>= 4.2'
19-
else
20-
"~> #{version}"
21-
end
22-
gem 'rails', rails
14+
15+
case version
16+
when 'master'
17+
gem 'rails', { git: 'https://github.com/rails/rails.git' }
18+
gem 'arel', { git: 'https://github.com/rails/arel.git' }
19+
when 'default'
20+
gem 'rails', '>= 4.2'
21+
else
22+
gem 'rails', "~> #{version}"
23+
end

0 commit comments

Comments
 (0)