mirror of https://github.com/rails/rails
Use released arel
This commit is contained in:
parent
623c3706b9
commit
b611350e7c
1
Gemfile
1
Gemfile
|
@ -17,7 +17,6 @@ gem 'rack-cache', '~> 1.2'
|
|||
gem 'jquery-rails', github: 'rails/jquery-rails', branch: 'master'
|
||||
gem 'coffee-rails', '~> 4.1.0'
|
||||
gem 'turbolinks'
|
||||
gem 'arel', github: 'rails/arel', branch: 'master'
|
||||
|
||||
gem 'sprockets-rails', '~> 3.0.0.beta3', github: 'rails/sprockets-rails', branch: 'master'
|
||||
|
||||
|
|
11
Gemfile.lock
11
Gemfile.lock
|
@ -27,13 +27,6 @@ GIT
|
|||
rack (2.0.0.alpha)
|
||||
json
|
||||
|
||||
GIT
|
||||
remote: git://github.com/rails/arel.git
|
||||
revision: 899e8428c50c586e6c8d4884b542ac9fdf01e95f
|
||||
branch: master
|
||||
specs:
|
||||
arel (7.0.0.alpha)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/rails/globalid.git
|
||||
revision: 4e74ec6bb60d735ef3c56080f9c9f1dee9cadaaf
|
||||
|
@ -108,7 +101,7 @@ PATH
|
|||
activerecord (5.0.0.alpha)
|
||||
activemodel (= 5.0.0.alpha)
|
||||
activesupport (= 5.0.0.alpha)
|
||||
arel (= 7.0.0.alpha)
|
||||
arel (~> 7.0)
|
||||
activesupport (5.0.0.alpha)
|
||||
concurrent-ruby (~> 1.0)
|
||||
i18n (~> 0.7)
|
||||
|
@ -139,6 +132,7 @@ GEM
|
|||
remote: https://rubygems.org/
|
||||
specs:
|
||||
amq-protocol (2.0.0)
|
||||
arel (7.0.0)
|
||||
backburner (1.2.0)
|
||||
beaneater (~> 1.0)
|
||||
dante (> 0.1.5)
|
||||
|
@ -332,7 +326,6 @@ DEPENDENCIES
|
|||
activerecord-jdbcmysql-adapter (>= 1.3.0)
|
||||
activerecord-jdbcpostgresql-adapter (>= 1.3.0)
|
||||
activerecord-jdbcsqlite3-adapter (>= 1.3.0)
|
||||
arel!
|
||||
backburner
|
||||
bcrypt (~> 3.1.10)
|
||||
bcrypt-ruby (~> 3.0.0)
|
||||
|
|
|
@ -24,5 +24,5 @@ Gem::Specification.new do |s|
|
|||
s.add_dependency 'activesupport', version
|
||||
s.add_dependency 'activemodel', version
|
||||
|
||||
s.add_dependency 'arel', '7.0.0.alpha'
|
||||
s.add_dependency 'arel', '~> 7.0'
|
||||
end
|
||||
|
|
|
@ -221,7 +221,6 @@ module Rails
|
|||
def rails_gemfile_entry
|
||||
dev_edge_common = [
|
||||
GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails'),
|
||||
GemfileEntry.github('arel', 'rails/arel'),
|
||||
GemfileEntry.github('rack', 'rack/rack')
|
||||
]
|
||||
if options.dev?
|
||||
|
|
Loading…
Reference in New Issue