Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-19 07:26:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

upgrade to rails 2.3.12 and fix deprecation warning and fix some version numbers of gems used for testing

Browse source
This commit is contained in:
Reinier Balt 2011-06-09 17:04:00 +02:00
parent a3c5920a2b
commit ceda51b5bf
34 changed files with 2451 additions and 11266 deletions
Download patch file Download diff file Expand all files Collapse all files

4
vendor/rails/actionpack/lib/action_controller/request.rb vendored
View file

@ -446,7 +446,9 @@ EOM
end
def reset_session
session.destroy if session
# session may be a hash, if so, we do not want to call destroy
# fixes issue 6440
session.destroy if session and session.respond_to?(:destroy)
self.session = {}
end

1
vendor/rails/actionpack/lib/action_controller/session/abstract_store.rb vendored
View file

@ -196,6 +196,7 @@ module ActionController
if (request_cookies.nil? || request_cookies[@key] != sid) || options[:expire_after]
cookie = {:value => sid}
cookie[:expires] = Time.now + options[:expire_after] if options[:expire_after]
Rack::Utils.set_cookie_header!(response[1], @key, cookie.merge(options))
end
end