Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2008-12-07 | 210 | -2215/+1685 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb actionpack/lib/action_controller/base.rb actionpack/lib/action_controller/mime_type.rb railties/doc/guides/html/activerecord_validations_callbacks.html railties/doc/guides/html/caching_with_rails.html railties/doc/guides/html/command_line.html railties/doc/guides/html/configuring.html railties/doc/guides/html/creating_plugins.html railties/doc/guides/html/finders.html railties/doc/guides/html/routing_outside_in.html railties/doc/guides/source/activerecord_validations_callbacks.txt railties/doc/guides/source/caching_with_rails.txt railties/doc/guides/source/command_line.txt railties/doc/guides/source/creating_plugins/acts_as_yaffle.txt railties/doc/guides/source/creating_plugins/controllers.txt railties/doc/guides/source/creating_plugins/core_ext.txt railties/doc/guides/source/creating_plugins/helpers.txt railties/doc/guides/source/creating_plugins/index.txt railties/doc/guides/source/creating_plugins/migration_generator.txt railties/doc/guides/source/creating_plugins/models.txt railties/doc/guides/source/creating_plugins/odds_and_ends.txt railties/doc/guides/source/creating_plugins/routes.txt railties/doc/guides/source/finders.txt railties/doc/guides/source/routing_outside_in.txt railties/doc/guides/source/testing_rails_applications.txt | ||||
| * | Silence server backtrace in rescue templates and log files. Also remove some ↵ | Joshua Peek | 2008-12-05 | 1 | -8/+11 |
| | | | | | | | | noise from missing template errors. | ||||
| * | Add Memoizable#flush_cache to clear the cache of a specific method [#1505 ↵ | Joshua Peek | 2008-12-03 | 2 | -16/+38 |
| | | | | | | | | state:resolved] | ||||
| * | Ruby 1.9 compat: no Unicode normalization support yet | Jeremy Kemper | 2008-11-26 | 3 | -3/+27 |
| | | |||||
| * | Ruby 1.9 compat: CGI#escape_skipping_slashes | Jeremy Kemper | 2008-11-26 | 1 | -5/+14 |
| | | |||||
| * | MiniTest::Unit#method_name alias for Test::Unit compat | Jeremy Kemper | 2008-11-26 | 1 | -0/+1 |
| | | |||||
| * | Don't re-require 'rexml/document' | Pratik Naik | 2008-11-26 | 1 | -1/+1 |
| | | |||||
| * | Added ActiveSupport::OrderedHash#each_key and ↵ | Christoffer Sawicki | 2008-11-26 | 3 | -0/+22 |
| | | | | | | | | | | | | ActiveSupport::OrderedHash#each_value [#1410 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Simpler and clearer to just explicitly require the JSON encoders | Jeremy Kemper | 2008-11-26 | 1 | -9/+15 |
| | | |||||
| * | Autoload ActiveSupport::XmlMini | Jeremy Kemper | 2008-11-26 | 2 | -1/+1 |
| | | |||||
| * | Require as little of REXML as possible to apply the entity_expansion_limit fix | Jeremy Kemper | 2008-11-26 | 1 | -24/+29 |
| | | |||||
| * | Lazy-require CGI for Object#to_query | Jeremy Kemper | 2008-11-26 | 1 | -2/+1 |
| | | |||||
| * | Extract XmlMini. Namespace FileLike extension. | Jeremy Kemper | 2008-11-25 | 2 | -128/+125 |
| | | |||||
| * | Rescue OpenSSL::Cipher::CipherError or OpenSSL::CipherError depending on ↵ | Jeremy Kemper | 2008-11-25 | 1 | -3/+4 |
| | | | | | | | | which is present | ||||
| * | Unbundled XmlSimple | Jeremy Kemper | 2008-11-25 | 2 | -1027/+0 |
| | | |||||
| * | Extract XmlMini from XmlSimple. [#1474 state:committed] | Joseph Holsten | 2008-11-25 | 1 | -21/+106 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-11-25 | 4 | -1/+117 |
| |\ | |||||
| | * | Add a MessageEncryptor, just like MessageVerifier but using symmetric key ↵ | Michael Koziarski | 2008-11-25 | 4 | -1/+117 |
| | | | | | | | | | | | | | | | | | | | | | | | | encryption. The use of encryption prevents people from seeing any potentially secret values you've used. It also supports and encrypt_and_sign model to prevent people from tampering with the bits and creating random junk that gets fed to A motivated coder could use this to add an :encrypt=>true option to the cookie store. | ||||
| * | | AS::Dependencies also has core extensions; don't autoload it. | Jeremy Kemper | 2008-11-24 | 1 | -1/+1 |
| |/ | |||||
| * | Add config.preload_frameworks to load all frameworks at startup. Default to ↵ | Jeremy Kemper | 2008-11-24 | 1 | -2/+0 |
| | | | | | | | | false so Rails autoloads itself as it's used. | ||||
| * | JSON can't be autoloaded since it includes core extensions | Jeremy Kemper | 2008-11-24 | 1 | -1/+1 |
| | | |||||
| * | Require builder before fast_xs so we don't tickle its over-eager ↵ | Jeremy Kemper | 2008-11-24 | 1 | -1/+2 |
| | | | | | | | | String#to_xs collision check | ||||
| * | Explicitly require Builder in test that uses it | Jeremy Kemper | 2008-11-24 | 1 | -0/+1 |
| | | |||||
| * | Revert "Hack builder to look for fast_xs instead of insisting on its own ↵ | Jeremy Kemper | 2008-11-24 | 2 | -3/+2 |
| | | | | | | | | | | | | String#to_xs" This reverts commit 5d3712a81e502f46b2745d238d9bb76fcdb31f5b. | ||||
| * | Allow optional arguments and/or block for Object#try like Object#send does. ↵ | Eloy Duran | 2008-11-24 | 2 | -2/+14 |
| | | | | | | | | | | | | | | | | [#1425 state:resolved] Original suggestion by Pat Nakajima. Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | require json lib when serialization is loaded | Joshua Peek | 2008-11-24 | 1 | -1/+1 |
| | | |||||
| * | Add LAZY env flag for testing autoload/lazy load feature | Joshua Peek | 2008-11-24 | 1 | -1/+1 |
| | | |||||
| * | Autoload more ActiveSupport libs | Joshua Peek | 2008-11-24 | 1 | -22/+19 |
| | | |||||
| * | Autoload ActiveSupport::Duration, Gzip, OptionMerger, OrderedHash, ↵ | Jeremy Kemper | 2008-11-23 | 1 | -17/+14 |
| | | | | | | | | OrderedOptions, StringInquirer, TimeWithZone, and TimeZone also | ||||
| * | Autoload cache stores | Jeremy Kemper | 2008-11-23 | 1 | -6/+7 |
| | | |||||
| * | Duration requires BasicObject in case it's autoloaded early | Jeremy Kemper | 2008-11-23 | 1 | -0/+2 |
| | | |||||
| * | Lazy-require tzinfo for TimeZone | Jeremy Kemper | 2008-11-23 | 2 | -0/+2 |
| | | |||||
| * | Autoload ActiveSupport::SecureRandom and ::MessageVerifier | Jeremy Kemper | 2008-11-23 | 1 | -3/+5 |
| | | |||||
| * | Lazy-require tempfile for File#atomic_write | Jeremy Kemper | 2008-11-23 | 1 | -2/+2 |
| | | |||||
| * | Lazy-require DRb for ActiveSupport::Cache::DRbStore | Jeremy Kemper | 2008-11-23 | 1 | -3/+2 |
| | | |||||
| * | Lazy-require OpenSSL | Jeremy Kemper | 2008-11-23 | 1 | -1/+2 |
| | | |||||
| * | Lazy-require OpenSSL. Skip entirely if SecureRandom is available. | Jeremy Kemper | 2008-11-23 | 1 | -6/+8 |
| | | |||||
| * | Lazy-require XmlSimple. Move CGI require to object conversions where it's ↵ | Jeremy Kemper | 2008-11-23 | 2 | -3/+5 |
| | | | | | | | | actually used. | ||||
| * | Require Mocha >= 0.9.3 which includes a MiniTest adapter | Jeremy Kemper | 2008-11-23 | 3 | -57/+8 |
| | | |||||
| * | Hack builder to look for fast_xs instead of insisting on its own String#to_xs | Jeremy Kemper | 2008-11-23 | 2 | -2/+3 |
| | | |||||
| * | Lazy-require builder lib | Jeremy Kemper | 2008-11-23 | 2 | -3/+3 |
| | | |||||
| * | Move deprecation assertions so TestCase (and Mocha) needn't load on startup | Jeremy Kemper | 2008-11-23 | 3 | -59/+57 |
| | | |||||
| * | Eliminate thread-local circular reference stack by passing it as an argument ↵ | Jeremy Kemper | 2008-11-23 | 1 | -20/+8 |
| | | | | | | | | instead | ||||
| * | Don't include .rb suffix in core_ext requires | Jeremy Kemper | 2008-11-23 | 1 | -1/+1 |
| | | |||||
| * | Don't need _message as it's in the class name already | Michael Koziarski | 2008-11-23 | 2 | -8/+8 |
| | | |||||
| * | Add ActiveSupport::MessageVerifier to aid users who need to store ↵ | Michael Koziarski | 2008-11-23 | 4 | -0/+73 |
| | | | | | | | | | | | | tamper-proof messages in cookies etc. This is particularly useful for things like remember-me tokens in web applications and auto-unsubscribe links in emails. | ||||
| * | Changed the fallback String#each_char to use valid 1.9 syntax. | Tom Lea | 2008-11-22 | 1 | -1/+3 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Get ActiveSupport::TestCase working with classic Test::Unit and MiniTest. ↵ | Jeremy Kemper | 2008-11-22 | 3 | -106/+107 |
| | | | | | | | | Fix broken Mocha + MiniTest. Assume ruby-core applies patch #771 fixing libraries which extend Test::Unit. | ||||
| * | Ruby 1.9 compat: don't use defined? on complex expressions | Jeremy Kemper | 2008-11-22 | 1 | -1/+1 |
| | | |||||
| * | Require mocha >= 0.9.0 for AS tests | Jeremy Kemper | 2008-11-22 | 14 | -570/+524 |
| | |