Vijay Dev 014498e1d7 Merge branch 'master' of github.com:lifo/docrails ... Conflicts: guides/source/ruby_on_rails_guides_guidelines.textile		2012-03-24 17:15:10 +05:30
..
abstract_controller	Merge pull request #5480 from drogus/rendering-issues	2012-03-17 11:24:19 -03:00
action_controller	We dont need to merge in the parameters as thats all being reset by the rack headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing)	2012-03-20 22:23:18 +01:00
action_dispatch	Return an actual boolean from xml_http_request?	2012-03-23 20:19:38 -04:00
action_pack	rails/master is now 4.0.0.beta and will only support Ruby 1.9.3+	2011-12-20 09:30:37 -06:00
action_view	Merge branch 'master' of github.com:lifo/docrails	2012-03-24 17:15:10 +05:30
abstract_controller.rb
action_controller.rb	Remove --http.	2012-03-14 22:30:01 +01:00
action_dispatch.rb	Rack::SSL -> ActionDispatch::SSL	2012-03-17 13:36:35 -03:00
action_pack.rb	Updated copyright notices for 2012	2011-12-31 20:30:08 +00:00
action_view.rb	Merge pull request #4248 from andrew/2012	2011-12-31 12:48:19 -08:00