Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2008-10-05 | 12 | -167/+133 |
|\ | | | | | | | | | | | Conflicts: activerecord/lib/active_record/association_preload.rb | ||||
| * | Move controller ivar copying to a separate method | Pratik Naik | 2008-10-05 | 1 | -8/+10 |
| | | |||||
| * | Add tests for ActiveSupport::Rescuable. Use ActiveSupport::Rescuable in ↵ | Pratik Naik | 2008-10-04 | 1 | -99/+3 |
| | | | | | | | | ActionController::Base. | ||||
| * | Ensure rescue_from handlers are respected inside tests. [#835 state:resolved] | Pratik Naik | 2008-10-04 | 3 | -43/+30 |
| | | | | | | | | | | | | Note : If you're not using rescue_from, you should overrider rescue_action_without_handler() method and not rescue_action(). Afterwards, you can set request.remote_addr to a non "0.0.0.0" value for testing the overridden behavior. | ||||
| * | Return processing lock to dispatcher, the finer grained lock was ↵ | Aliaksey Kandratsenka | 2008-10-04 | 2 | -9/+14 |
| | | | | | | | | | | | | | | | | | | | | incompatible with the reloading in development mode. This commit also adds ActionController::Dispatcher#dispatch_unlocking -- non-locking version of dispatch. It's named anologously to POSIX {getc,getchar,...}_unlocked functions. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1170 state:committed] | ||||
| * | call clear_active_connections! in :after_dispatch to give pooled connections ↵ | Aliaksey Kandratsenka | 2008-10-04 | 2 | -1/+17 |
| | | | | | | | | | | | | | | | | | | | | | | back This fixes connection pool exhaustion for web servers which create new thread per connection (e.g. Webrick). integration.rb changes are required to keep test transaction active for several requests. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1171 state:committed] | ||||
| * | Fixed load path for actionmailer and activesupport tests to always load from ↵ | madlep | 2008-10-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | local lib files. [#983 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Call controller_path instance method so it can be easily overridden [#1141 ↵ | David Masover | 2008-09-30 | 1 | -2/+2 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Fix etag! and last_modified! to work as advertised. | Michael Koziarski | 2008-09-30 | 2 | -3/+44 |
| | | | | | | | | Add tests too. | ||||
| * | Remove unneeded interning. | Michael Koziarski | 2008-09-30 | 1 | -3/+2 |
| | | |||||
| * | Add options to field_set_tag | Andrew Kaspick | 2008-09-29 | 2 | -2/+14 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1116 state:committed] | ||||
| * | Protect body ivar from being clobbered by the mailer template assigns | Joshua Peek | 2008-09-28 | 1 | -2/+2 |
| | | |||||
* | | check_box form helper object must be an @instance object. | Simon Tokumine | 2008-09-28 | 1 | -4/+4 |
| | | |||||
* | | Change erroneous "unless" to "if" in documentation. | Mike Gunderloy | 2008-09-27 | 1 | -1/+1 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2008-09-27 | 20 | -1976/+561 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb railties/Rakefile railties/doc/guides/activerecord/association_basics.txt railties/doc/guides/debugging/debugging_rails_applications.txt railties/doc/guides/getting_started_with_rails/getting_started_with_rails.txt railties/doc/guides/index.txt railties/doc/guides/migrations/foreign_keys.txt railties/doc/guides/migrations/migrations.txt railties/doc/guides/migrations/writing_a_migration.txt railties/doc/guides/routing/routing_outside_in.txt | ||||
| * | Use ActiveSupport::SecureRandom instead of the strange fallback code. | Michael Koziarski | 2008-09-24 | 1 | -22/+2 |
| | | |||||
| * | Merge branch 'patches' into multibyte | Michael Koziarski | 2008-09-22 | 3 | -153/+377 |
| |\ | |||||
| | * | Bump the Version constants to align with the *next* release rather than the ↵ | Michael Koziarski | 2008-09-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | previous release. This allows people tracking non-release gems or git submodules to use the constants. | ||||
| | * | Fixed AssetTag cache with with relative_url_root [#1022 state:resolved] | Martin Rehfeld | 2008-09-22 | 2 | -1/+51 |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| | * | Refactor AssetTagHelper and fix remaining threadsafe issues. | Joshua Peek | 2008-09-22 | 2 | -152/+326 |
| | | | |||||
| * | | Remove special 1.9 version of excerpt helper. | Manfred Stienstra | 2008-09-21 | 1 | -45/+45 |
| | | | |||||
| * | | Change all calls to String#chars to String#mb_chars. Remove a exception for ↵ | Manfred Stienstra | 2008-09-21 | 1 | -87/+41 |
| |/ | | | | | | | Ruby <= 1.9. | ||||
| * | Fixed missing template paths on exception [#1082 state:resolved] | Claudio Poli | 2008-09-20 | 4 | -25/+37 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | I18n: Introduce I18n.load_path in favor of I18n.load_translations and change ↵ | Sven Fuchs | 2008-09-20 | 1 | -1/+1 |
| | | | | | | | | | | | | Simple backend to load translations lazily. [#1048 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Remove the country_select helper. | Michael Koziarski | 2008-09-18 | 4 | -1645/+0 |
| | | | | | | | | | | | | | | | | We're in no position to mediate disputes on this matter, and the previous change to use ISO 3166 has offended just as many people as the ad-hoc list did. If you want the old list back you can install the plugin: ruby script/plugin install git://github.com/rails/country_select.git | ||||
| * | Added support for http_only cookies in cookie_store Added unit tests for ↵ | Pelle Braendgaard | 2008-09-17 | 6 | -4/+64 |
| | | | | | | | | | | | | | | secure and http_only cookies in cookie_store Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1046 state:committed] | ||||
| * | Merge docrails | Pratik Naik | 2008-09-13 | 2 | -15/+15 |
| | | |||||
* | | a leading slash in the :controller of url_for ensures you link to the root ↵ | Xavier Noria | 2008-09-23 | 1 | -3/+11 |
| | | | | | | | | namespace | ||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2008-09-13 | 1 | -15/+17 |
|\| | |||||
| * | Switched computed public paths cache over to a simple hash w/ mutex | Joshua Peek | 2008-09-10 | 1 | -15/+17 |
| | | |||||
* | | fixing typo in #sortable_element doc | bryan | 2008-09-12 | 1 | -1/+1 |
| | | |||||
* | | Fix a typo in guide and change assertion style in examples | Pratik Naik | 2008-09-10 | 1 | -14/+14 |
|/ | |||||
* | Disable warnings in AP tests | Jeremy Kemper | 2008-09-10 | 1 | -7/+8 |
| | |||||
* | Added ActionController::Translation module delegating to I18n #translate/#t ↵ | Sven Fuchs | 2008-09-10 | 3 | -0/+41 |
| | | | | | | and #localize/#l [status:committed #1008] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Added image_submit_tag confirm option [status:committed #784] | Alastair Brunton | 2008-09-10 | 3 | -0/+19 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | The FormTagHelper#submit_tag helper will now pass along the original value ↵ | Jose Fernandez | 2008-09-10 | 3 | -12/+11 |
| | | | | | | of the submit button to the params if the :disable_with option is used [status:committed #633] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Only separate loggings with a comma when there are actually two statements | David Heinemeier Hansson | 2008-09-09 | 1 | -1/+2 |
| | |||||
* | Stopped logging template compiles as it only clogs up the log | David Heinemeier Hansson | 2008-09-09 | 2 | -4/+3 |
| | |||||
* | Revert "Revert "Add layout functionality to mailers."" | David Heinemeier Hansson | 2008-09-09 | 1 | -1/+5 |
| | | | | This reverts commit 36c6aa01ee0a7aee5b0510a8e649c44de318b060. | ||||
* | Revert "Add layout functionality to mailers." | David Heinemeier Hansson | 2008-09-09 | 1 | -5/+1 |
| | | | | This reverts commit e9a8e0053be3b293ab89fb584f1d660063f107aa. | ||||
* | Ruby 1.9 compat: remove constants from block parameters | Akira Matsuda | 2008-09-09 | 1 | -0/+1 |
| | | | | | | [#1002 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Check for uninitialized instance variables | Jeremy Kemper | 2008-09-08 | 4 | -20/+24 |
| | |||||
* | Remove recognized_optimized method before redefining it | Jeremy Kemper | 2008-09-08 | 1 | -2/+15 |
| | |||||
* | Use defined? check since @view_paths may be uninitialized | Jeremy Kemper | 2008-09-08 | 1 | -1/+5 |
| | |||||
* | Ensure routing optimizations are cleared when new routes are added [#981 ↵ | Matt Jones | 2008-09-07 | 3 | -2/+41 |
| | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Use a more sensible resolution on the new millisecond benchmarks | David Heinemeier Hansson | 2008-09-05 | 3 | -9/+9 |
| | |||||
* | Changed all benchmarking reports to be in milliseconds | David Heinemeier Hansson | 2008-09-05 | 3 | -27/+51 |
| | |||||
* | Merge docrails | Pratik Naik | 2008-09-03 | 7 | -68/+73 |
| | |||||
* | Some performance goodness for inheritable attributes. | Clemens Kofler | 2008-09-03 | 2 | -8/+8 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Some performance goodness for routing. | Clemens Kofler | 2008-09-03 | 1 | -3/+3 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> |