Use Arel master with Rails 4.2/master for now. Fixes #444.
This commit is contained in:
parent
0fba76a741
commit
f48d94a3bd
4
Gemfile
4
Gemfile
|
@ -5,6 +5,10 @@ gem 'rake'
|
||||||
|
|
||||||
rails = ENV['RAILS'] || 'master'
|
rails = ENV['RAILS'] || 'master'
|
||||||
|
|
||||||
|
if rails[0,3] == '4.2' || rails == 'master'
|
||||||
|
gem 'arel', github: 'rails/arel', branch: 'master'
|
||||||
|
end
|
||||||
|
|
||||||
gem 'polyamorous', '~> 1.1'
|
gem 'polyamorous', '~> 1.1'
|
||||||
|
|
||||||
# Provide timezone information on Windows
|
# Provide timezone information on Windows
|
||||||
|
|
Loading…
Reference in New Issue