| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master-sec' | Aaron Patterson | 2012-05-31 | 1 | -0/+22 |
|\ |
|
| * | Strip [nil] from parameters hash. | Aaron Patterson | 2012-05-30 | 1 | -0/+22 |
| * | Fix the build | Santiago Pastorino | 2012-05-22 | 1 | -1/+0 |
| * | require active_support/lazy_load_hooks where is needed | Santiago Pastorino | 2012-05-22 | 1 | -0/+1 |
* | | Extracted redirect logic from ActionController::Force::ClassMethods.force_ssl | Jeremy Friesen | 2012-05-31 | 1 | -7/+15 |
* | | Simplify link_to using content_tag | Carlos Antonio da Silva | 2012-05-31 | 1 | -12/+6 |
* | | Make link_to arguments explicit | Carlos Antonio da Silva | 2012-05-31 | 1 | -8/+4 |
* | | Make button_to arguments explicit and refactor a bit | Carlos Antonio da Silva | 2012-05-31 | 1 | -10/+6 |
* | | Simplify logic to initialize valid conditions in RouteSet | Carlos Antonio da Silva | 2012-05-31 | 1 | -7/+3 |
* | | accept a block in button_to helper | Sergey Nartimov | 2012-05-30 | 1 | -3/+28 |
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-30 | 1 | -1/+1 |
|\ \ |
|
| * | | fix typo in render_template [ci skip] | Brent Vatne | 2012-05-29 | 1 | -1/+1 |
* | | | Review requires from number helper | Carlos Antonio da Silva | 2012-05-28 | 1 | -4/+1 |
* | | | Parse float value only once in number helpers | Carlos Antonio da Silva | 2012-05-28 | 1 | -11/+11 |
* | | | Merge pull request #6315 from appfolio/moving_number_helper_methods_to_active... | José Valim | 2012-05-28 | 2 | -285/+38 |
|\ \ \ |
|
| * | | | Moving NumberHelpers from ActionView to ActiveSupport | Andrew Mutz | 2012-05-27 | 2 | -285/+38 |
| |/ / |
|
* / / | Fix sorting of helpers from different paths | Piotr Sarnacki | 2012-05-28 | 1 | -2/+2 |
|/ / |
|
* | | Add `:escape` option for `truncate` | Rafael Mendonça França | 2012-05-26 | 1 | -2/+5 |
* | | Update the documentation and add CHANGELOG entry | Rafael Mendonça França | 2012-05-26 | 1 | -3/+3 |
* | | Test that the block used in truncate is escaped if it is not HTML safe | Rafael Mendonça França | 2012-05-26 | 1 | -13/+12 |
* | | Truncate now has the ability to receive a html option that allows it to call ... | Li Ellis Gallardo | 2012-05-26 | 1 | -2/+12 |
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-26 | 1 | -4/+3 |
|\ \ |
|
| * | | references to the old behavior removed | Mikhail Vaysman | 2012-05-25 | 1 | -4/+3 |
* | | | Remove implicit dependency on pathname | José Valim | 2012-05-25 | 1 | -3/+3 |
|/ / |
|
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-23 | 2 | -5/+13 |
|\ \ |
|
| * | | Revert "Remove blank trailing comments" | Vijay Dev | 2012-05-23 | 29 | -0/+67 |
| * | | copy edit[ci skip] | Vijay Dev | 2012-05-23 | 1 | -1/+1 |
| * | | Fix incorrect example for fields_for - without the '=' it will not output any... | David Morton | 2012-05-22 | 1 | -1/+1 |
| * | | Remove blank trailing comments | Henrik Hodne | 2012-05-20 | 29 | -67/+0 |
| * | | Update documentation for AbstractController::Base | Henrik Hodne | 2012-05-20 | 1 | -3/+11 |
* | | | Merge pull request #6453 from parndt/session_keys | José Valim | 2012-05-22 | 1 | -0/+8 |
|\ \ \ |
|
| * | | | Added ActionDispatch::Request::Session#keys and ActionDispatch::Request::Sess... | Philip Arndt | 2012-05-23 | 1 | -0/+8 |
* | | | | Refactor date related helpers | Carlos Galdino | 2012-05-22 | 6 | -50/+26 |
|/ / / |
|
* | | | Merge pull request #6359 from carlosgaldino/add-html5-inputs | Jeremy Kemper | 2012-05-22 | 8 | -0/+248 |
|\ \ \ |
|
| * | | | Add several HTML5 input helpers | Carlos Galdino | 2012-05-21 | 7 | -0/+205 |
| * | | | Add HTML5 input[type="color"] helper | Carlos Galdino | 2012-05-21 | 4 | -0/+43 |
* | | | | Fixed typo new_defautls -> new_defaults. | Philip Arndt | 2012-05-23 | 1 | -2/+2 |
| |_|/
|/| | |
|
* | | | Merge pull request #6429 from marcandre/fix_test_request | Carlos Antonio da Silva | 2012-05-21 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Fix bug when Rails.application is defined but is nil. See #881 | Marc-Andre Lafortune | 2012-05-21 | 1 | -1/+1 |
* | | | | Add instance_accessor option to class_attribute | Alexey Vakhov | 2012-05-22 | 1 | -2/+1 |
|/ / / |
|
* | | | Revert "Merge pull request #6425 from pinetops/resolver_concurrency_fix" | José Valim | 2012-05-21 | 1 | -68/+19 |
* | | | Merge pull request #6425 from pinetops/resolver_concurrency_fix | Aaron Patterson | 2012-05-21 | 1 | -19/+68 |
|\ \ \
| |/ /
|/| | |
|
| * | | More granular locking of the Resolver template cache | Tom Clarke | 2012-05-21 | 1 | -5/+23 |
| * | | Make the Resolver template cache threadsafe - closes #6404 | Tom Clarke | 2012-05-21 | 1 | -19/+50 |
* | | | Merge pull request #2549 from trek/RoutingErrorForMissingControllers | Aaron Patterson | 2012-05-21 | 1 | -3/+7 |
|\ \ \ |
|
| * | | | When a route references a missing controller, raise ActionController::Routing... | Trek Glowacki | 2011-08-16 | 1 | -3/+7 |
* | | | | Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614c | José Valim | 2012-05-20 | 1 | -10/+22 |
* | | | | Escape the extension when normalizing the action cache path. | Andrew White | 2012-05-20 | 1 | -2/+3 |
* | | | | Return 400 Bad Request for URL paths with invalid encoding. | Andrew White | 2012-05-20 | 2 | -0/+18 |
* | | | | Raise ActionController::BadRequest for malformed parameter hashes. | Andrew White | 2012-05-20 | 3 | -5/+16 |