diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-12-18 04:53:38 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-12-18 04:54:50 -0200 |
| commit | 477bed8871a1e15cb91825b4a4efee5b308d4cf8 (patch) | |
| tree | 6632718594d5ba1204a91269e12186f71e55d520 | |
| parent | e5ea82b52d7df8053cb289b81d3081dfe602a3e6 (diff) | |
| download | rails-477bed8871a1e15cb91825b4a4efee5b308d4cf8.tar.gz rails-477bed8871a1e15cb91825b4a4efee5b308d4cf8.tar.bz2 rails-477bed8871a1e15cb91825b4a4efee5b308d4cf8.zip | |
Use released rack
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 11 | ||||
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 3 |
3 files changed, 3 insertions, 14 deletions
@@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index 20a218cf73..6eb3aebd0e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,14 +20,6 @@ GIT 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 branch: stable @@ -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) diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 9036966d42..3545606ce7 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -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) |