kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

point at rack master

Browse source
This commit is contained in:
Aaron Patterson 2015-08-20 13:43:57 -07:00
parent 86e0136f48
commit 51211a94bd
6 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -7,6 +7,7 @@ gem 'rake', '>= 10.3'
# Active Job depends on the URI::GID::MissingModelIDError, which isn't released yet.
gem 'globalid', github: 'rails/globalid'
gem 'rack', github: 'rack/rack'
# This needs to be with require false as it is
# loaded after loading the test library to

54
Gemfile.lock
View file

@ -25,6 +25,13 @@ GIT
mail (2.6.3.edge)
mime-types (>= 1.16, < 3)
GIT
remote: git://github.com/rack/rack.git
revision: 2cb9430fce32da2f2dbccf9de97ab691351c1408
specs:
rack (2.0.0.alpha)
json
GIT
remote: git://github.com/rails/arel.git
revision: d5432b4616ff43fbb14540d351eed351e21bb20e
@ -62,21 +69,21 @@ GIT
GIT
remote: git://github.com/rails/sprockets-rails.git
revision: ad4a43bd1bb19c86a8bf94a2ad5e477686161490
revision: e65e088575be4f6b994823b80a277affb0a57a5e
branch: master
specs:
sprockets-rails (3.0.0)
sprockets-rails (3.0.0.beta2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
GIT
remote: git://github.com/rails/sprockets.git
revision: de057b4f13deb2bb5e8684cd06b9b687f5d09792
revision: 653de5268ba862ea23457291824180c67ad5dc99
branch: master
specs:
sprockets (4.0.0)
rack (~> 1.0)
rack (~> 2.x)
PATH
remote: .
@ -90,7 +97,7 @@ PATH
actionpack (5.0.0.alpha)
actionview (= 5.0.0.alpha)
activesupport (= 5.0.0.alpha)
rack (~> 1.6)
rack (~> 2.x)
rack-test (~> 0.6.3)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
@ -139,7 +146,7 @@ PATH
GEM
remote: https://rubygems.org/
specs:
amq-protocol (1.9.2)
amq-protocol (2.0.0)
backburner (1.0.0)
beaneater (~> 1.0)
dante (> 0.1.5)
@ -149,11 +156,10 @@ GEM
beaneater (1.0.0)
benchmark-ips (2.3.0)
builder (3.2.2)
bunny (1.7.0)
bunny (2.0.0)
amq-protocol (>= 1.9.2)
byebug (5.0.0)
columnize (= 0.9.0)
celluloid (0.16.1)
byebug (6.0.2)
celluloid (0.16.0)
timers (~> 4.0.0)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
@ -162,7 +168,6 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
columnize (0.9.0)
concurrent-ruby (0.9.1)
connection_pool (2.2.0)
dalli (2.7.4)
@ -173,7 +178,7 @@ GEM
activerecord (>= 3.0, < 5.0)
delayed_job (>= 3.0, < 4.1)
erubis (2.7.0)
execjs (2.5.2)
execjs (2.6.0)
hitimes (1.2.2)
hitimes (1.2.2-x86-mingw32)
i18n (0.7.0)
@ -181,7 +186,7 @@ GEM
kindlerb (0.1.1)
mustache
nokogiri
loofah (2.0.2)
loofah (2.0.3)
nokogiri (>= 1.5.9)
metaclass (0.0.4)
method_source (0.8.2)
@ -201,16 +206,13 @@ GEM
psych (2.0.13)
que (0.10.0)
racc (1.4.12)
rack (1.6.4)
rack-cache (1.2)
rack (>= 0.4)
rack-protection (1.5.3)
rack
rack-test (0.6.3)
rack (>= 1.0)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.6)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
@ -248,23 +250,20 @@ GEM
redis (~> 3.2, >= 3.2.1)
redis-namespace (~> 1.5, >= 1.5.2)
sigdump (0.2.3)
sinatra (1.4.6)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
sneakers (1.0.4)
bunny (~> 1.7.0)
sinatra (1.0)
rack (>= 1.0)
sneakers (1.1.0)
bunny (>= 1.7.0, <= 2.0.0)
serverengine (~> 1.5.5)
thor
thread (~> 0.1.7)
sqlite3 (1.3.10)
stackprof (0.2.7)
sucker_punch (1.5.0)
celluloid (~> 0.16.0)
sucker_punch (1.5.1)
celluloid (= 0.16.0)
thor (0.19.1)
thread (0.1.7)
thread_safe (0.3.5)
tilt (2.0.1)
timers (4.0.1)
hitimes
turbolinks (2.5.3)
@ -315,6 +314,7 @@ DEPENDENCIES
que
queue_classic!
racc (>= 1.4.6)
rack!
rack-cache (~> 1.2)
rails!
rake (>= 10.3)
@ -337,4 +337,4 @@ DEPENDENCIES
w3c_validators
BUNDLED WITH
1.10.5
1.10.6

2
actionpack/actionpack.gemspec
View file

@ -21,7 +21,7 @@ Gem::Specification.new do |s|
s.add_dependency 'activesupport', version
s.add_dependency 'rack', '~> 1.6'
s.add_dependency 'rack', '~> 2.x'
s.add_dependency 'rack-test', '~> 0.6.3'
s.add_dependency 'rails-html-sanitizer', '~> 1.0', '>= 1.0.2'
s.add_dependency 'rails-dom-testing', '~> 1.0', '>= 1.0.5'

4
actionpack/lib/action_dispatch/request/session.rb
View file

@ -4,8 +4,8 @@ module ActionDispatch
class Request < Rack::Request
# Session is responsible for lazily loading the session from store.
class Session # :nodoc:
ENV_SESSION_KEY = Rack::Session::Abstract::ENV_SESSION_KEY # :nodoc:
ENV_SESSION_OPTIONS_KEY = Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY # :nodoc:
ENV_SESSION_KEY = Rack::RACK_SESSION # :nodoc:
ENV_SESSION_OPTIONS_KEY = Rack::RACK_SESSION_OPTIONS # :nodoc:
# Singleton object used to determine if an optional param wasn't specified
Unspecified = Object.new

2
actionpack/test/dispatch/request/session_test.rb
View file

@ -7,7 +7,7 @@ module ActionDispatch
def test_create_adds_itself_to_env
env = {}
s = Session.create(store, env, {})
assert_equal s, env[Rack::Session::Abstract::ENV_SESSION_KEY]
assert_equal s, env[Rack::RACK_SESSION]
end
def test_to_hash

2
railties/lib/rails/generators/app_base.rb
View file

@ -212,6 +212,7 @@ module Rails
GemfileEntry.github('sprockets', 'rails/sprockets'),
GemfileEntry.github('sass-rails', 'rails/sass-rails'),
GemfileEntry.github('arel', 'rails/arel')
GemfileEntry.github('rack', 'rack/rack')
]
elsif options.edge?
[
@ -220,6 +221,7 @@ module Rails
GemfileEntry.github('sprockets', 'rails/sprockets'),
GemfileEntry.github('sass-rails', 'rails/sass-rails'),
GemfileEntry.github('arel', 'rails/arel')
GemfileEntry.github('rack', 'rack/rack')
]
else
[GemfileEntry.version('rails',