aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #8546 from hsbt/fix-testcase-strict-warningSantiago Pastorino2012-12-301-1/+2
|\ \ | |/ |/| fix testcase: ruby-2.0.0 warned unused variables
| * change spy of after invoked controller action. because ruby-2.0.0 waned ↵SHIBATA Hiroshi2012-12-201-1/+2
| | | | | | | | unused variables
* | Merge pull request #8627 from schneems/schneems/routes-1-9Rafael Mendonça França2012-12-261-1/+1
|\ \ | | | | | | Ruby 1.9 style hash in Route Inspector
| * | Ruby 1.9 style hash in Route Inspectorschneems2012-12-271-1/+1
| | |
* | | Extract the component rendering of collection_radio_buttons andRafael Mendonça França2012-12-262-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collection_check_boxes to a private method. It will make easier to extend. Example: class CollectionRadioButtons < ActionView::Helpers::Tags::CollectionRadioButtons include CollectionExtensions def render wrap_rendered_collection(super, @options) end private def render_component(builder) builder.radio_button + builder.label(:class => "collection_radio_buttons") end end
* | | Fix collection_radio_buttons with the option `:checked` with value ofRafael Mendonça França2012-12-262-1/+8
| | | | | | | | | | | | `false`
* | | Merge pull request #8598 from NARKOZ/refactor-highlightSantiago Pastorino2012-12-261-2/+2
|\ \ \ | | | | | | | | refactor highlight method: return fast if text or phrases are blank
| * | | fetch highlighter option only when neededNihad Abbasov2012-12-241-2/+2
| | | |
* | | | Fix CHANGELOG style [ci skip]Rafael Mendonça França2012-12-261-1/+1
| | | |
* | | | We need to check explictly that env['action_dispatch.show_exceptions']Rafael Mendonça França2012-12-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | is false. If it is nil we can't raise the exception
* | | | more descriptive return parametersHrvoje Šimić2012-12-261-4/+3
|/ / /
* | | "warning: ambiguous first argument; put parentheses or even spaces"Akira Matsuda2012-12-241-1/+1
| | |
* | | we're not supporting SQLite 2Akira Matsuda2012-12-241-13/+5
| | |
* | | Merge pull request #8085 from acapilleri/format_never_nilGuillermo Iguaran2012-12-224-3/+28
|\ \ \ | | | | | | | | if format is unknown NullMimeTypeObject is returned
| * | | return Mime::NullType if format is unknownAngelo Capilleri2012-12-224-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a request has an unknown format, the methods html?, xml?, json? ...etc not raise an Exception. This patch add a class Mime::NullType, that is returned when request.format is unknown and it responds false to the methods that ends with '?' and true to 'nil?'. It refers to #7837, this issue is considered a improvement not a bug.
* | | | Merge pull request #8586 from balexand/cache_digests_regexRafael Mendonça França2012-12-213-2/+12
|\ \ \ \ | |/ / / |/| | | Digestor explicit dependency should not contain trailing whitespace
| * | | Digestor explicit dependency should not contain trailing whitespaceBrian Alexander2012-12-213-2/+12
| | | | | | | | | | | | | | | | test for rails/rails#8586
* | | | Move background jobs to the 'jobs' branch until fully baked. Not shipping ↵Jeremy Kemper2012-12-211-10/+0
| | | | | | | | | | | | | | | | with Rails 4.0.
* | | | Merge pull request #7312 from krainboltgreene/http-token-parser-bugSteve Klabnik2012-12-212-17/+56
|\ \ \ \ | |/ / / |/| | | Http token parser bug
| * | | Refactoring the token_and_options method to fix bugsKurtis Rainbolt-Greene2012-12-152-17/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a test for the equal trun bug Adding a test for the after equal trunc bug Adding a test for the slash bug Adding a test for the slash quote bug Adding a helper method for creating a sample request object with token Writing a method to create params array from raw params Writing a method to rewrite param values in the params Writing a method to get the token params from an authorization value Refactoring the token_and_options method to fix bugs Removing unnessecary test A constant for this shared regex seemed appropriate Wanting to split up this logic Adding small documentation pieces
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-212-1/+6
|\ \ \ \
| * | | | Revert "Fix incorrect adjustment 4c41e87e3ae548c44810b66437b2f0f6e73b2106"Vijay Dev2012-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e1f8ec59f2cc83f052b15233147aa2d6d8114a4d. Reason: seems bad styling [ci skip]
| * | | | Fix incorrect adjustment 4c41e87e3ae548c44810b66437b2f0f6e73b2106kei2012-12-201-1/+1
| | | | |
| * | | | Fix documentation stylekei2012-12-201-1/+1
| | | | |
| * | | | Add script_name option description and example for #url_for optionsIvan Vanyak2012-12-171-0/+5
| |/ / /
* | | | Fix indentation issuing warningCarlos Antonio da Silva2012-12-201-1/+1
| | | |
* | | | Merge pull request #8567 from frodsan/update_coding_conventions_journeyRafael Mendonça França2012-12-2017-438/+440
|\ \ \ \ | | | | | | | | | | update AD::Journey to follow Rails coding conventions
| * | | | update AD::Journey to follow Rails coding conventionsFrancesco Rodriguez2012-12-2017-438/+440
| | | | |
* | | | | Fix CHANGELOG entry about scope changeGuillermo Iguaran2012-12-201-1/+1
|/ / / / | | | | | | | | I missed attribution on this :flushed:
* | | | :nodoc: Journey because is not part of the public API [ci skip]Francesco Rodriguez2012-12-1920-78/+75
| | | |
* | | | remove code for Ruby 1.8.x supportFrancesco Rodriguez2012-12-191-7/+2
| | | |
* | | | Remove the actual extension file as well [ci skip]Andrew White2012-12-191-11/+0
| | | |
* | | | Remove obsolete Hash extension needed for Ruby 1.8.x supportAndrew White2012-12-191-1/+0
| | | | | | | | | | | | | | | | [ci skip]
* | | | Integrate Journey into Action DispatchAndrew White2012-12-1944-3/+3967
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the Journey code underneath the ActionDispatch namespace so that we don't pollute the global namespace with names that may be used for models. Fixes rails/journey#49.
* | | | Move changelog entry to the top [ci skip]Carlos Antonio da Silva2012-12-191-5/+5
| | | |
* | | | Remove obfuscation support from mail_to helperNick Reed2012-12-183-110/+17
| | | | | | | | | | | | | | | | | | | | | | | | Removes support for :encode, :replace_at, and :replace_dot options from the mail_to helper. Support for these options has been extracted to the 'actionview-encoded_mail_to' gem.
* | | | Minor js review [ci skip]Carlos Antonio da Silva2012-12-181-7/+7
| | | | | | | | | | | | | | | | Remove/add ; where necessary, fix indentation.
* | | | handle protocol option in stylesheet_link_tag and javascript_include_tagVasiliy Ermolovich2012-12-183-3/+33
| |_|/ |/| | | | | | | | closes #8388
* | | Format routes as html on debug pageschneems2012-12-174-2/+76
| |/ |/| | | | | | | | | | | | | | | When someone gets a routing exception, the routes are rendered (starting in Rails 4.0). This PR brings parity between the html routes in the `rails/info/routes` path and when rendered from an exception. This is the continuation of #8521 which brought html formatted routes. In addition to bringing parity to the two views, we're keeping our views DRY by rendering off of the same partials. In this case Railties depends on partials provided by ActionDispatch. I'm open to alternative implementations. Ideally both views will use the same code so any improvements or updates to it will be reproduced on both. <hr /> ![](http://f.cl.ly/items/3O1D0K1v0j0i343O3T3T/Screen%20Shot%202012-12-17%20at%203.07.20%20PM.png)
* | Make conditional_layout? private and update documentationAndrew White2012-12-171-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The conditional_layout? method is not for public use and doesn't actually do what the documentation suggested it does. It's actually used to determine whether or not to use the explicit layout definition defined in a controller or use the implicit layout definition. Also documentation was added for the action_has_layout? method which acts as a master switch for disabling the layout for the current action. This method was added so that action caching didn't depend on accessing layout internals but is also used by third-parties, most notably the [Hobo][1] application. [1]: https://github.com/hobo/hobo
* | Merge pull request #8529 from schneems/schneems/debug-exceptions-extend-pathSteve Klabnik2012-12-161-1/+1
|\ \ | |/ |/| DebugExceptions `File.join` => `File.expand_path`
| * DebugExceptions `File.join` => `File.expand_path`schneems2012-12-161-1/+1
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-151-0/+412
|\ \ | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_helper.rb railties/lib/rails/info_controller.rb
| * | repeating documentation for form helpersThiago Pinto2012-12-091-18/+406
| | |
* | | Convert changelogs to 1.9 hash style and fix some formatting [ci skip]Carlos Antonio da Silva2012-12-141-26/+26
| | |
* | | Revert "Merge pull request #8499 from schneems/schneems/html-route-inspector"Steve Klabnik2012-12-141-24/+7
| | | | | | | | | | | | | | | | | | | | | This reverts commit ae68fc3864e99ab43c18fd12577744e1583f6b64, reversing changes made to 0262a18c7b0ab6f60fee842b3007388f9ffeb0fa. See here: https://github.com/rails/rails/pull/8499#issuecomment-11356417
* | | remove a cache we do not needAaron Patterson2012-12-141-5/+1
| | |
* | | Merge pull request #8510 from thedarkone/thread_safety_improvementsAaron Patterson2012-12-146-63/+48
|\ \ \ | | | | | | | | Thread safety improvements
| * | | Replace some global Hash usages with the new thread safe cache.thedarkone2012-12-146-63/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary of the changes: * Add thread_safe gem. * Use thread safe cache for digestor caching. * Replace manual synchronization with ThreadSafe::Cache in Relation::Delegation. * Replace @attribute_method_matchers_cache Hash with ThreadSafe::Cache. * Use TS::Cache to avoid the synchronisation overhead on listener retrieval. * Replace synchronisation with TS::Cache usage. * Use a preallocated array for performance/memory reasons. * Update the controllers cache to the new AS::Dependencies::ClassCache API. The original @controllers cache no longer makes much sense after @tenderlove's changes in 7b6bfe84f3 and f345e2380c. * Use TS::Cache in the connection pool to avoid locking overhead. * Use TS::Cache in ConnectionHandler.
* | | | Improve the documentation of cache_if and cache_unlessRafael Mendonça França2012-12-141-4/+7
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 19:34:32 +0000