aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #6315 from ↵José Valim2012-05-282-285/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | appfolio/moving_number_helper_methods_to_active_support Moving number helper from ActionView to Active Support
| * | | | Moving NumberHelpers from ActionView to ActiveSupportAndrew Mutz2012-05-272-285/+38
| |/ / /
* / / / Fix sorting of helpers from different pathsPiotr Sarnacki2012-05-281-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When more than one directory for helpers is provided to a controller, it should preserver the order of directories. Given 2 paths: MyController.helpers_paths = ["dir1/helpers", "dir2/helpers"] helpers from dir1 should be loaded first. Before this commit, all helpers were mixed and then sorted alphabetically, which essentially would require to rename helpers to get desired order. This is a problem especially for engines, where you would like to be able to predict accurately which engine helpers will load first. (closes #6496)
* | | Add `:escape` option for `truncate`Rafael Mendonça França2012-05-261-2/+5
| | | | | | | | | | | | This options can be used to not escape the result by default.
* | | Update the documentation and add CHANGELOG entryRafael Mendonça França2012-05-261-3/+3
| | |
* | | Test that the block used in truncate is escaped if it is not HTML safeRafael Mendonça França2012-05-261-13/+12
| | | | | | | | | | | | Refactoring the truncate method to not do a sort-circuit return
* | | Truncate now has the ability to receive a html option that allows it to call ↵Li Ellis Gallardo2012-05-261-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rails helpers. This way if my text is long I don't have to do something like this: .text = truncate(@text, :length => 27) if @text.size >= 27 = link_to "continue", notes_path, ....."")
* | | 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-251-3/+3
|/ / /
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-232-5/+13
|\ \ \
| * | | Revert "Remove blank trailing comments"Vijay Dev2012-05-2329-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a. Reason: Not a fan of such massive changes. We usually close such changes if made to Rails master as a pull request. Following the same principle here and reverting. [ci skip]
| * | | copy edit[ci skip]Vijay Dev2012-05-231-1/+1
| | | |
| * | | Fix incorrect example for fields_for - without the '=' it will not output ↵David Morton2012-05-221-1/+1
| | | | | | | | | | | | | | | | anything.
| * | | Remove blank trailing commentsHenrik Hodne2012-05-2029-67/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace with the first match, and voilà! Note that the regex matches a little bit too much, so you probably want to `git add -i .` and go through every single diff to check if it actually should be changed.
| * | | Update documentation for AbstractController::BaseHenrik Hodne2012-05-201-3/+11
| | | |
* | | | Merge pull request #6453 from parndt/session_keysJosé Valim2012-05-221-0/+8
|\ \ \ \ | | | | | | | | | | Added session.keys and session.values back to ActionDispatch::Request::Session
| * | | | Added ActionDispatch::Request::Session#keys and ↵Philip Arndt2012-05-231-0/+8
| | | | | | | | | | | | | | | | | | | | ActionDispatch::Request::Session#values
* | | | | Refactor date related helpersCarlos Galdino2012-05-226-50/+26
|/ / / /
* | | | Merge pull request #6359 from carlosgaldino/add-html5-inputsJeremy Kemper2012-05-228-0/+248
|\ \ \ \ | | | | | | | | | | Add HTML5 color and date/time inputs
| * | | | Add several HTML5 input helpersCarlos Galdino2012-05-217-0/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The input types added are: - input[type="month"] - input[type="week"] - input[type="datetime"] - input[type="datetime-local"]
| * | | | Add HTML5 input[type="color"] helperCarlos Galdino2012-05-214-0/+43
| | | | |
* | | | | Fixed typo new_defautls -> new_defaults.Philip Arndt2012-05-231-2/+2
| |_|/ / |/| | | | | | | | | | | | | | | * Added tests for 'else' case in ActionView::Helpers::TranslationHelper#wrap_translate_defaults * Also updated the testing syntax of translation.html_safe? asserts to provide better output upon failure.
* | | | Merge pull request #6429 from marcandre/fix_test_requestCarlos Antonio da Silva2012-05-211-1/+1
|\ \ \ \ | | | | | | | | | | Fix bug when Rails.application is defined but is nil. See #881
| * | | | Fix bug when Rails.application is defined but is nil. See #881Marc-Andre Lafortune2012-05-211-1/+1
| | |_|/ | |/| |
* / | | 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-211-68/+19
| | | | | | | | | | | | | | | This reverts commit 254c04286c5916ae7f91eb6e173b312e7a74e364, reversing changes made to 513a0525c24c2944630acfa465b22cd2f4601adf.
* | | Merge pull request #6425 from pinetops/resolver_concurrency_fixAaron Patterson2012-05-211-19/+68
|\ \ \ | |/ / |/| | Resolver concurrency fix
| * | More granular locking of the Resolver template cacheTom Clarke2012-05-211-5/+23
| | | | | | | | | | | | | | | | | | | | | In order to avoid holding a global lock when doing template resolution, instead add individual locks on a per cache entry basis. The global lock is now only used for manipulation of the main cache data structure.
| * | Make the Resolver template cache threadsafe - closes #6404Tom Clarke2012-05-211-19/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Template cache in the Resolver can be accessed by multiple threads similtaneously in multi-threaded environments. The cache is implemented using a Hash, which isn't threadsafe in all VMs (notably JRuby). This commit extracts the cache to a new Cache class and adds mutexes to prevent concurrent access.
* | | Merge pull request #2549 from trek/RoutingErrorForMissingControllersAaron Patterson2012-05-211-3/+7
|\ \ \ | | | | | | | | When a route references a missing controller, raise ActionController::RoutingError with clearer message
| * | | When a route references a missing controller, raise ↵Trek Glowacki2011-08-161-3/+7
| | | | | | | | | | | | | | | | ActionController::RoutingError with a clearer message
* | | | Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614cJosé Valim2012-05-201-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Template concurrency fixes Conflicts: actionpack/lib/action_view/template.rb
* | | | Escape the extension when normalizing the action cache path.Andrew White2012-05-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although no recognized formats use non-ASCII characters, sometimes they can be included in the :format parameter because of invalid URLS. To prevent encoding incompatibility errors we need to escape them before passing the path to URI.unescape. Closes #4379
* | | | Return 400 Bad Request for URL paths with invalid encoding.Andrew White2012-05-202-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing path parameters with invalid encoding is likely to trigger errors further on like `ArgumentError (invalid byte sequence in UTF-8)`. This will result in a 500 error whereas the better error to return is a 400 error which allows exception notification libraries to filter it out if they wish. Closes #4450
* | | | Raise ActionController::BadRequest for malformed parameter hashes.Andrew White2012-05-203-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently Rack raises a TypeError when it encounters a malformed or ambiguous hash like `foo[]=bar&foo[4]=bar`. Rather than pass this through to the application this commit captures the exception and re-raises it using a new ActionController::BadRequest exception. The new ActionController::BadRequest exception returns a 400 error instead of the 500 error that would've been returned by the original TypeError. This allows exception notification libraries to ignore these errors if so desired. Closes #3051
* | | | 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-201-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, assert_recognizes, assert_generates, and assert_routing raised ActionController::RoutingError when they failed to recognize the route. This commit changes them to raise Assertion instead. This aligns with convention for logical failures, and supports reporting tools that care about the difference between logical failures and errors e.g. the summary at the end of a test run. - Fixes #5899
* | | | Show in log correct wrapped keysDmitry Vorotilin2012-05-201-1/+2
| | | |
* | | | Merge pull request #5631 from avakhov/ac-log-subsriber-small-refacPiotr Sarnacki2012-05-191-3/+1
|\ \ \ \ | |_|_|/ |/| | | Make AC::LogSubscriber#send_file like #send_data
| * | | Make AC::LogSubscriber#send_file like #send_dataAlexey Vakhov2012-05-191-3/+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 ↵Avi Tzurel2012-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | one, added blank hash before that in the args list
| * | | | 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-191-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the method API more clear by explicitly showing the expected arguments. This means that the options cannot be passed as second argument because we are not relying on extract_options! anymore, you are expected to give a selected key or `nil` if you want to pass options, as it is the last argument. Notice that this does not change the current method arguments contract available in 3.2, it just brings back the same functionality with the divider addition.
* | | | | Improve `rake routes` output for redirects - closes #6369.Andrew White2012-05-191-12/+22
| |/ / / |/| | |
* | | | Merge pull request #6384 from ihid/tidy_text_helpersJeremy Kemper2012-05-181-14/+20
|\ \ \ \ | | | | | | | | | | Tidied and standardised text_helper implementations.
| * | | | Tidied and standardised text_helper implementations.Jeremy Walker2012-05-191-14/+20
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 16:34:32 +0000