aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Ensure option_html_attributes does not modify the given option hashesCarlos Antonio da Silva2012-08-111-1/+1
| | | | | | | | | | | | We can avoid creating extra hashes with #merge, and use #merge! instead.
* | | Simplify html attributes generation for options_for_selectCarlos Antonio da Silva2012-08-111-3/+5
| | | | | | | | | | | | | | | | | | | | | Further simplify the option_html_attributes method after the changes introduced in dacbcbe55745aa9e5484b10b11f65ccca7db1c54 to not escape the html options here (since they're going to be escaped down the chain in content tag).
* | | Merge pull request #7314 from schneems/schneems/form_for_errorRafael Mendonça França2012-08-101-0/+1
|\ \ \ | | | | | | | | Check for Blank Record in form_for
| * | | check for nil or empty record in form_forschneems2012-08-101-0/+1
| | | | | | | | | | | | | | | | if nil or an empty array is passed into form_for you get a horrible error message, this one is much more indicative of what the programmer needs to know to fix the problem.
* | | | Merge pull request #7329 from guilleiguaran/move-default-headers-ad-railtieRafael Mendonça França2012-08-101-0/+5
|\ \ \ \ | | | | | | | | | | Move AD default_headers configurations to railtie
| * | | | Move AD default_headers configurations to railtieGuillermo Iguaran2012-08-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionDispatch railtie is a better place for config.action_dispatch.default_headers settings, users can continue overriding those settings in their configuration files if needed.
* | | | | Further refactor build_conditions in route setCarlos Antonio da Silva2012-08-101-5/+3
|/ / / / | | | | | | | | | | | | | | | | Return the conditions from the keep_if call, and ignore the value argument since it's not being used.
* | | | Fix handling SCRIPT_NAME from within mounted engine'sPiotr Sarnacki2012-08-112-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you mount your application at a path, for example /myapp, server should set SCRIPT_NAME to /myapp. With such information, rails application knows that it's mounted at /myapp path and it should generate routes relative to that path. Before this patch, rails handled SCRIPT_NAME correctly only for regular apps, but it failed to do it for mounted engines. The solution was to hardcode default_url_options[:script_name], which is not the best answer - it will work only when application is mounted at a fixed path. This patch fixes the situation by respecting original value of SCRIPT_NAME when generating application's routes from engine and the other way round - when you generate engine's routes from application. This is done by using one of 2 pieces of information in env - current SCRIPT_NAME or SCRIPT_NAME for a corresponding router. This is because we have 2 cases to handle: - generating engine's route from application: in this situation SCRIPT_NAME is basically SCRIPT_NAME set by the server and it indicates the place where application is mounted, so we can just pass it as :original_script_name in url_options. :original_script_name is used because if we use :script_name, router will ignore generating prefix for engine - generating application's route from engine: in this situation we already lost information about the SCRIPT_NAME that server used. For example if application is mounted at /myapp and engine is mounted at /blog, at this point SCRIPT_NAME is equal /myapp/blog. Because of that we need to keep reference to /myapp SCRIPT_NAME by binding it to the current router. Later on we can extract it and use when generating url Please note that starting from now you *should not* use default_url_options[:script_name] explicitly if your server already passes correct SCRIPT_NAME to rack env. (closes #6933)
* | | | Merge pull request #7321 from bogdan/refactor_routes_setSantiago Pastorino2012-08-101-10/+7
|\ \ \ \ | |/ / / |/| | | RouteSet: refactor internals
| * | | RouteSet: refactor internalsBogdan Gusiev2012-08-101-10/+7
| | | | | | | | | | | | | | | | | | | | No need to build valid_conditions array. We can get all the data in place.
* | | | Do not mark strip_tags result as html_safeSantiago Pastorino2012-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Thanks to Marek Labos & Nethemba CVE-2012-3465
* | | | Merge pull request #7302 from homakov/default_headersAaron Patterson2012-08-092-0/+6
|\ \ \ \ | | | | | | | | | | Introduce default_headers. closes #6311 #6515
| * | | | introduce default_headers configEgor Homakov2012-08-092-0/+6
| |/ / /
* | | | initialize instance variablesAaron Patterson2012-08-093-0/+22
| | | |
* | | | use a sized buffer to prevent the queue being too largeAaron Patterson2012-08-081-10/+10
|/ / /
* | | Allow data attributes to be set as a first-level option for form_for, so you ↵David Heinemeier Hansson2012-08-081-0/+19
| | | | | | | | | | | | can write `form_for @record, data: { behavior: 'autosave' }` instead of `form_for @record, html: { data: { behavior: 'autosave' } }` *DHH*
* | | Modernize the documentation for view caching somewhatDavid Heinemeier Hansson2012-08-082-53/+23
| | |
* | | Deprecate `button_to_function` and `link_to_function` helpers.Rafael Mendonça França2012-08-071-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We recommend the use of Unobtrusive JavaScript instead. For example: link_to "Greeting", "#", :class => "nav_link" $(function() { $('.nav_link').click(function() { // Some complex code return false; }); }); or link_to "Greeting", '#', onclick: "alert('Hello world!'); return false", class: "nav_link" for simple cases. This reverts commit 3acdd652e9fe99481c879c84c5807a84eb9ad724.
* | | Revert "Merge pull request #7033 from kron4eg/master". Not a a fan at all of ↵David Heinemeier Hansson2012-08-071-10/+4
| | | | | | | | | | | | | | | | | | | | | what this makes ERB files look like. This reverts commit 46b8bceedd3e47169c50a04c93161424909c75fb, reversing changes made to 2f58795e783150f2e1b1f6c64e305703f0061129.
* | | Restoring the '%' trim mode for ERb templates, allowing for a leading ↵Artiom Di2012-08-071-4/+10
| | | | | | | | | | | | percent sign on a line to indicate non-inserted Ruby code.
* | | Rearrange example output of javascript_include_tagPrem Sichanugrist2012-08-061-2/+2
| | |
* | | Do not include application.js if it doesn't existsPrem Sichanugrist2012-08-061-4/+7
| | | | | | | | | | | | | | | | | | Rails were including 'application.js' to the pack when using `javascript_include_tag :all` even there's no application.js in the public directory.
* | | removes usage of Object#in? from the code base (the method remains defined ↵Xavier Noria2012-08-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by Active Support) Selecting which key extensions to include in active_support/rails made apparent the systematic usage of Object#in? in the code base. After some discussion in https://github.com/rails/rails/commit/5ea6b0df9a36d033f21b52049426257a4637028d we decided to remove it and use plain Ruby, which seems enough for this particular idiom. In this commit the refactor has been made case by case. Sometimes include? is the natural alternative, others a simple || is the way you actually spell the condition in your head, others a case statement seems more appropriate. I have chosen the one I liked the most in each case.
* | | Revert "polymorphic_url with an array generates a query string"Andrew White2012-08-041-4/+1
| | | | | | | | | | | | | | | Passing options as the last value in an array doesn't work with form_for. This reverts commit 61c8a4d926343903593a27080216af7e4ed81268.
* | | Revert "Refactor passing url options via array for polymorphic_url"Andrew White2012-08-041-2/+2
| | | | | | | | | | | | | | | Passing options as the last value in an array doesn't work with form_for. This reverts commit 6be564c7a087773cb0b51c54396cc190e4f5c983.
* | | RouteSet: cleanup some unneeded compexityBogdan Gusiev2012-08-041-16/+7
| | |
* | | Renamed _path_segments to _recallBogdan Gusiev2012-08-043-4/+4
| | |
* | | Simplify logical statementBogdan Gusiev2012-08-041-4/+2
| | |
* | | Merge branch 'polymorphic_url_builds_query_string_with_array'Andrew White2012-08-041-1/+4
|\ \ \ | |/ / |/| |
| * | Refactor passing url options via array for polymorphic_urlAndrew White2012-08-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Rather than keep the url options in record_or_hash_or_array, extract it and reverse merge with options as it may contain important private keys like `:routing_type`. Closes #7259
| * | polymorphic_url with an array generates a query stringRomain Tribes2012-08-041-1/+4
| | | | | | | | | | | | | | | Generating an URL with an array of records is now able to build a query string if the last item of the array is a hash.
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-08-042-1/+9
|\ \ \ | |/ / |/| | | | | | | | | | | Conflicts: activemodel/lib/active_model/secure_password.rb activerecord/lib/active_record/associations/collection_proxy.rb
| * | copy edits [ci skip]Vijay Dev2012-08-041-2/+2
| | |
| * | fix punctuation in #resources and #match documentation [ci skip]Francesco Rodriguez2012-07-311-4/+4
| | |
| * | Update #match documentation [ci skip]Robert Pankowecki2012-07-311-0/+4
| | |
| * | Update #resources documentation [ci skip]Robert Pankowecki2012-07-311-0/+4
| | |
| * | use 'HTTP_AUTHORIZATION' instead of :authorization as key when dealing with ↵Francesco Rodriguez2012-07-271-1/+1
| | | | | | | | | | | | HTTP Token authentication in integration tests
* | | Use content_tag here instead of manually building HTMLSantiago Pastorino2012-08-031-2/+6
| | |
* | | Collapsed dual checks (one for content headers and one for content) into a ↵Armand du Plessis2012-08-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | single check. Rails includes a single character body to a head(:no_content) response to work around an old Safari bug where headers were ignored if no body sent. This patch brings the behavior slightly closer to spec if :no_content/204 is explicity requested via a head only response. Status comparison done on symbolic and numeric values Not returning any content when responding with head and limited to a status code that explicitly states no content will be returned - 100..199, 204, 205, 304.
* | | Merge pull request #7240 from steveklabnik/fix_2301Rafael Mendonça França2012-08-021-1/+1
|\ \ \ | | | | | | | | Fix for digest authentication bug - issue #2301 in rails/rails
| * | | Fix for digest authentication bug - issue #2301 in rails/railsArthur Smith2012-08-021-1/+1
| | | |
* | | | load active_support/deprecation in active_support/railsXavier Noria2012-08-021-1/+0
| | | |
* | | | load active_support/core_ext/module/delegation in active_support/railsXavier Noria2012-08-026-6/+0
| | | |
* | | | load active_support/core_ext/class/attribute in active_support/railsXavier Noria2012-08-0214-14/+0
| | | |
* | | | load active_support/concern in active_support/railsXavier Noria2012-08-024-4/+0
| | | |
* | | | load active_support/dependencies/autoload in active_support/railsXavier Noria2012-08-022-2/+0
| | | |
* | | | load active_support/core_ext/object/inclusion in active_support/railsXavier Noria2012-08-024-4/+0
| | | |
* | | | load active_support/core_ext/object/blank in active_support/railsXavier Noria2012-08-0227-27/+0
| | | |
* | | | defines a private require-hub active_support/railsXavier Noria2012-08-024-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a private place to put those AS features that are used by every component. Nowadays we cherry-pick individual files wherever they are used, but that it is not worth the effort for stuff that is going to be loaded for sure sooner or later, like blank?, autoload, concern, etc.
* | | | Check validity of options[:as] just onceJosé Valim2012-08-021-12/+18
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 04:00:38 +0000