mirror of https://github.com/rails/rails
Use released rack
This commit is contained in:
parent
e5ea82b52d
commit
477bed8871
3
Gemfile
3
Gemfile
|
@ -5,9 +5,6 @@ gemspec
|
|||
# We need a newish Rake since Active Job sets its test tasks' descriptions.
|
||||
gem 'rake', '>= 10.3'
|
||||
|
||||
# We need unreleased Rack 2.0.0.alpha
|
||||
gem 'rack', github: 'rack/rack', branch: 'master'
|
||||
|
||||
# This needs to be with require false to ensure correct loading order, as has to
|
||||
# be loaded after loading the test library.
|
||||
gem 'mocha', '~> 0.14', require: false
|
||||
|
|
11
Gemfile.lock
11
Gemfile.lock
|
@ -19,14 +19,6 @@ GIT
|
|||
qu (= 0.2.0)
|
||||
redis-namespace
|
||||
|
||||
GIT
|
||||
remote: git://github.com/rack/rack.git
|
||||
revision: 96ae9b9fed8d6809383b6f48a5884437e76f8ca4
|
||||
branch: master
|
||||
specs:
|
||||
rack (2.0.0.alpha)
|
||||
json
|
||||
|
||||
GIT
|
||||
remote: git://github.com/sass/sass.git
|
||||
revision: bce9509f396225d721501ea1070a6871b708abb1
|
||||
|
@ -209,6 +201,8 @@ GEM
|
|||
puma (2.15.3)
|
||||
que (0.11.2)
|
||||
racc (1.4.14)
|
||||
rack (2.0.0.alpha)
|
||||
json
|
||||
rack-cache (1.5.1)
|
||||
rack (>= 0.4)
|
||||
rack-test (0.6.3)
|
||||
|
@ -331,7 +325,6 @@ DEPENDENCIES
|
|||
que
|
||||
queue_classic!
|
||||
racc (>= 1.4.6)
|
||||
rack!
|
||||
rack-cache (~> 1.2)
|
||||
rails!
|
||||
rake (>= 10.3)
|
||||
|
|
|
@ -220,8 +220,7 @@ module Rails
|
|||
|
||||
def rails_gemfile_entry
|
||||
dev_edge_common = [
|
||||
GemfileEntry.github('rack', 'rack/rack')
|
||||
]
|
||||
]
|
||||
if options.dev?
|
||||
[
|
||||
GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH)
|
||||
|
|
Loading…
Reference in New Issue