Yehuda Katz + Carl Lerche 00a9d4b91c Merge branch 'master' into wip_abstract_controller ...

Conflicts:
	actionpack/lib/action_controller/abstract/callbacks.rb
	actionpack/lib/action_controller/abstract/renderer.rb
	actionpack/lib/action_controller/base/base.rb
	actionpack/lib/action_controller/dispatch/dispatcher.rb
	actionpack/lib/action_controller/routing/route_set.rb
	actionpack/lib/action_controller/testing/process.rb
	actionpack/test/abstract_controller/layouts_test.rb
	actionpack/test/controller/filters_test.rb
	actionpack/test/controller/helper_test.rb
	actionpack/test/controller/render_test.rb
	actionpack/test/new_base/test_helper.rb

2009-05-11 17:07:05 -07:00

..

cache

Fix dependencies revealed by testing in isolation

2009-04-22 18:54:13 -07:00

core

No more free lunch

2009-04-22 16:10:49 -07:00

core_ext

Check for date/time methods that moved upstream in 1.9

2009-05-07 18:39:03 -07:00

deprecation

Don't undefine object_id

2009-04-26 15:56:08 -07:00

json

Use __send__ for BasicObject friendliness

2009-04-26 20:05:17 -07:00

locale

Change Array#to_sentence I18n options to pass comma and space character from outside.

2008-12-08 15:53:20 -08:00

multibyte

Bring abstract_controller up to date with rails/master

2009-04-13 15:18:45 -07:00

testing

Fix dependencies revealed by testing in isolation

2009-04-22 18:54:13 -07:00

values

Change spelling of Kyev timezone to Kyiv [#2613 state:resolved]

2009-05-10 11:59:03 -05:00

vendor

Autoload I18n simple backend

2009-04-17 22:24:36 -07:00

xml_mini

add JRuby-JDOM backend for XmlMini

2009-04-26 16:13:55 -07:00

backtrace_cleaner.rb

Added ActiveSupport::BacktraceCleaner and Rails::BacktraceCleaner for cutting down on backtrace noise (inspired by the Thoughtbot Quiet Backtrace plugin) [DHH]

2008-11-22 18:06:08 +01:00

base64.rb

* Introduce ActiveSupport.core_ext Integer, %w(conversions time etc)

2009-03-21 04:35:15 -07:00

basic_object.rb

Prefer a less intrusive BlankSlate-alike that doesn't hook Object# and Kernel#method_added to remove future methods

2009-03-21 04:35:15 -07:00

buffered_logger.rb

Merge branch 'master' into cherry

2009-04-20 18:31:40 -07:00

cache.rb

Fix dependencies revealed by testing in isolation

2009-04-22 18:54:13 -07:00

callbacks.rb

Fix dependencies revealed by testing in isolation

2009-04-22 18:54:13 -07:00

concurrent_hash.rb

Resurrecting 1.9 compatibility.

2009-04-13 16:56:04 -07:00

core_ext.rb

Unneeded util require

2009-03-28 23:38:21 -07:00

core.rb

Encapsulate date/time core extensions and constant autoloads in active_support/core/time

2009-03-31 10:03:35 -07:00

dependencies.rb

Fix dependencies revealed by testing in isolation

2009-04-22 18:54:13 -07:00

dependency_module.rb

Merge branch 'master' into wip_abstract_controller

2009-05-11 17:07:05 -07:00

deprecation.rb

Dice up ActiveSupport::Deprecation

2009-04-17 21:29:30 -07:00

duration.rb

Fix dependencies revealed by testing in isolation

2009-04-22 18:54:13 -07:00

gzip.rb

Improve documentation.

2008-03-26 12:27:52 +00:00

hash_with_indifferent_access.rb

Namespace HashWithIndifferentAccess

2009-03-21 18:45:09 -07:00

inflections.rb

Adding inflection of databases (usually we wouldn't amend the current defaults, but this seems to obvious) [#1942 state:committed]

2009-02-12 14:31:27 +01:00

inflector.rb

Fix dependencies revealed by testing in isolation

2009-04-22 18:54:13 -07:00

json.rb

Convert encoding before escaping

2009-04-26 16:21:57 -07:00

memoizable.rb

Fix dependencies revealed by testing in isolation

2009-04-22 18:54:13 -07:00

message_encryptor.rb

Rescue OpenSSL::Cipher::CipherError or OpenSSL::CipherError depending on which is present

2008-11-25 23:36:33 -08:00

message_verifier.rb

Lazy-require OpenSSL

2008-11-23 15:29:03 -08:00

mini.rb

Begin unifying the interface between ActionController and ActionView

2009-01-22 16:18:10 -06:00

multibyte.rb

Fix dependencies revealed by testing in isolation

2009-04-22 18:54:13 -07:00

new_callbacks.rb

Don't run the action if callbacks are halted.

2009-05-11 11:48:38 -07:00

option_merger.rb

Explicit dependency on Hash#deep_merge extension

2009-03-28 23:52:46 -07:00

ordered_hash.rb

ActiveSupport::OrderedHash[1,2,3,4] creates an OrderedHash instead of a Hash.

2009-05-11 11:45:57 -07:00

ordered_options.rb

Explicit dependency on OrderedHash

2009-03-28 23:53:04 -07:00

rescuable.rb

Explicit dependency on Proc#bind extension

2009-03-28 23:54:00 -07:00

secure_random.rb

Lazy-require OpenSSL. Skip entirely if SecureRandom is available.

2008-11-23 15:27:09 -08:00

string_inquirer.rb

Don't rely on string CoreExtensions in StringInquirer since it is sometimes expected to work before the core extension are loaded

2008-10-30 17:48:32 +01:00

test_case.rb

Bring abstract_controller up to date with rails/master

2009-04-13 15:18:45 -07:00

time_with_zone.rb

Now that we have a separate internal rails_to_json, use a separate circular reference stack instead of sticking it in the options hash

2009-04-26 20:04:47 -07:00

vendor.rb

Only require builder at startup if we need to monkey with its String#to_xs demands

2009-03-21 04:35:16 -07:00

version.rb

Prepare for final 2.3 release

2009-03-15 22:06:50 -05:00

whiny_nil.rb

Replaced unnecessary class variable with a constant in whiny nil.

2008-05-04 21:11:03 -05:00

xml_mini.rb

Fix dependencies revealed by testing in isolation

2009-04-22 18:54:13 -07:00