aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Add `:escape` option for `truncate`Rafael Mendonça França2012-05-263-2/+29
* Update the documentation and add CHANGELOG entryRafael Mendonça França2012-05-262-3/+5
* Test that the block used in truncate is escaped if it is not HTML safeRafael Mendonça França2012-05-262-25/+23
* Truncate now has the ability to receive a html option that allows it to call ...Li Ellis Gallardo2012-05-262-10/+41
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-261-4/+3
|\
| * references to the old behavior removedMikhail Vaysman2012-05-251-4/+3
* | Remove implicit dependency on pathnameJosé Valim2012-05-252-4/+4
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-232-5/+13
|\
| * Revert "Remove blank trailing comments"Vijay Dev2012-05-2329-0/+67
| * copy edit[ci skip]Vijay Dev2012-05-231-1/+1
| * Fix incorrect example for fields_for - without the '=' it will not output any...David Morton2012-05-221-1/+1
| * Remove blank trailing commentsHenrik Hodne2012-05-2029-67/+0
| * Update documentation for AbstractController::BaseHenrik Hodne2012-05-201-3/+11
* | Add license field to gemspecs, by Matt GriffinMatt Griffin2012-05-231-0/+1
* | Merge pull request #6453 from parndt/session_keysJosé Valim2012-05-222-0/+24
|\ \
| * | Added ActionDispatch::Request::Session#keys and ActionDispatch::Request::Sess...Philip Arndt2012-05-232-0/+24
* | | Add tests for time_field and date_field helpersCarlos Galdino2012-05-221-0/+18
* | | Refactor date related helpersCarlos Galdino2012-05-226-50/+26
|/ /
* | Merge pull request #6359 from carlosgaldino/add-html5-inputsJeremy Kemper2012-05-2212-0/+434
|\ \
| * | Add several HTML5 input helpersCarlos Galdino2012-05-2110-0/+368
| * | Add HTML5 input[type="color"] helperCarlos Galdino2012-05-218-0/+66
* | | Fixed typo new_defautls -> new_defaults.Philip Arndt2012-05-232-5/+15
* | | Merge pull request #6429 from marcandre/fix_test_requestCarlos Antonio da Silva2012-05-212-1/+8
|\ \ \
| * | | Fix bug when Rails.application is defined but is nil. See #881Marc-Andre Lafortune2012-05-212-1/+8
* | | | Add instance_accessor option to class_attributeAlexey Vakhov2012-05-221-2/+1
|/ / /
* | | Revert "Merge pull request #6425 from pinetops/resolver_concurrency_fix"José Valim2012-05-212-72/+23
* | | Merge pull request #6425 from pinetops/resolver_concurrency_fixAaron Patterson2012-05-212-23/+72
|\ \ \ | |/ / |/| |
| * | More granular locking of the Resolver template cacheTom Clarke2012-05-211-5/+23
| * | Make the Resolver template cache threadsafe - closes #6404Tom Clarke2012-05-212-23/+54
* | | Merge pull request #2549 from trek/RoutingErrorForMissingControllersAaron Patterson2012-05-212-3/+17
|\ \ \
| * | | When a route references a missing controller, raise ActionController::Routing...Trek Glowacki2011-08-162-3/+17
* | | | Refactoring: turn unless/else into if/elseAndrey Vakarev2012-05-211-9/+9
* | | | Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614cJosé Valim2012-05-201-10/+22
* | | | Fix CHANGELOG order and add a brief description of the changes in theRafael Mendonça França2012-05-201-3/+3
* | | | Escape the extension when normalizing the action cache path.Andrew White2012-05-202-3/+33
* | | | Return 400 Bad Request for URL paths with invalid encoding.Andrew White2012-05-204-0/+51
* | | | Raise ActionController::BadRequest for malformed parameter hashes.Andrew White2012-05-208-6/+47
* | | | Correct order of expected and actual argumentsAndrew White2012-05-201-1/+1
* | | | fix closing tag [ci skip]Vijay Dev2012-05-201-1/+1
* | | | Raise Assertion instead of RoutingError for routing assertion failures.David Chelimsky2012-05-204-18/+27
* | | | Show in log correct wrapped keysDmitry Vorotilin2012-05-202-1/+10
* | | | Merge pull request #5631 from avakhov/ac-log-subsriber-small-refacPiotr Sarnacki2012-05-191-3/+1
|\ \ \ \
| * | | | Make AC::LogSubscriber#send_file like #send_dataAlexey Vakhov2012-05-191-3/+1
* | | | | Don't use assert_block method. It will be deprecated.kennyj2012-05-201-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-191-1/+4
|\ \ \ \
| * | | | minor fix wrapper tag documentationFrancesco Rodriguez2012-05-181-1/+1
| * | | | Minor fix to the wrapper tag documentation, the options hash is the last one,...Avi Tzurel2012-05-191-1/+1
| * | | | Added wrapper tag documentation to the simple_format methodAvi Tzurel2012-05-191-1/+4
* | | | | Clarify grouped_options_for_select method API, add changelog entryCarlos Antonio da Silva2012-05-193-16/+19
* | | | | Improve `rake routes` output for redirects - closes #6369.Andrew White2012-05-191-12/+22
| |/ / / |/| | |