Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Restoring the '%' trim mode for ERb templates, allowing for a leading ↵ | Artiom Di | 2012-08-07 | 1 | -4/+10 |
| | | | | percent sign on a line to indicate non-inserted Ruby code. | ||||
* | Rearrange example output of javascript_include_tag | Prem Sichanugrist | 2012-08-06 | 1 | -2/+2 |
| | |||||
* | Do not include application.js if it doesn't exists | Prem Sichanugrist | 2012-08-06 | 1 | -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 Noria | 2012-08-06 | 2 | -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 White | 2012-08-04 | 1 | -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 White | 2012-08-04 | 1 | -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 compexity | Bogdan Gusiev | 2012-08-04 | 1 | -16/+7 |
| | |||||
* | Renamed _path_segments to _recall | Bogdan Gusiev | 2012-08-04 | 3 | -4/+4 |
| | |||||
* | Simplify logical statement | Bogdan Gusiev | 2012-08-04 | 1 | -4/+2 |
| | |||||
* | Merge branch 'polymorphic_url_builds_query_string_with_array' | Andrew White | 2012-08-04 | 1 | -1/+4 |
|\ | |||||
| * | Refactor passing url options via array for polymorphic_url | Andrew White | 2012-08-04 | 1 | -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 string | Romain Tribes | 2012-08-04 | 1 | -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/docrails | Vijay Dev | 2012-08-04 | 2 | -1/+9 |
|\ \ | |/ |/| | | | | | | | Conflicts: activemodel/lib/active_model/secure_password.rb activerecord/lib/active_record/associations/collection_proxy.rb | ||||
| * | copy edits [ci skip] | Vijay Dev | 2012-08-04 | 1 | -2/+2 |
| | | |||||
| * | fix punctuation in #resources and #match documentation [ci skip] | Francesco Rodriguez | 2012-07-31 | 1 | -4/+4 |
| | | |||||
| * | Update #match documentation [ci skip] | Robert Pankowecki | 2012-07-31 | 1 | -0/+4 |
| | | |||||
| * | Update #resources documentation [ci skip] | Robert Pankowecki | 2012-07-31 | 1 | -0/+4 |
| | | |||||
| * | use 'HTTP_AUTHORIZATION' instead of :authorization as key when dealing with ↵ | Francesco Rodriguez | 2012-07-27 | 1 | -1/+1 |
| | | | | | | | | HTTP Token authentication in integration tests | ||||
* | | Use content_tag here instead of manually building HTML | Santiago Pastorino | 2012-08-03 | 1 | -2/+6 |
| | | |||||
* | | Collapsed dual checks (one for content headers and one for content) into a ↵ | Armand du Plessis | 2012-08-02 | 1 | -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_2301 | Rafael Mendonça França | 2012-08-02 | 1 | -1/+1 |
|\ \ | | | | | | | Fix for digest authentication bug - issue #2301 in rails/rails | ||||
| * | | Fix for digest authentication bug - issue #2301 in rails/rails | Arthur Smith | 2012-08-02 | 1 | -1/+1 |
| | | | |||||
* | | | load active_support/deprecation in active_support/rails | Xavier Noria | 2012-08-02 | 1 | -1/+0 |
| | | | |||||
* | | | load active_support/core_ext/module/delegation in active_support/rails | Xavier Noria | 2012-08-02 | 6 | -6/+0 |
| | | | |||||
* | | | load active_support/core_ext/class/attribute in active_support/rails | Xavier Noria | 2012-08-02 | 14 | -14/+0 |
| | | | |||||
* | | | load active_support/concern in active_support/rails | Xavier Noria | 2012-08-02 | 4 | -4/+0 |
| | | | |||||
* | | | load active_support/dependencies/autoload in active_support/rails | Xavier Noria | 2012-08-02 | 2 | -2/+0 |
| | | | |||||
* | | | load active_support/core_ext/object/inclusion in active_support/rails | Xavier Noria | 2012-08-02 | 4 | -4/+0 |
| | | | |||||
* | | | load active_support/core_ext/object/blank in active_support/rails | Xavier Noria | 2012-08-02 | 27 | -27/+0 |
| | | | |||||
* | | | defines a private require-hub active_support/rails | Xavier Noria | 2012-08-02 | 4 | -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 once | José Valim | 2012-08-02 | 1 | -12/+18 |
| | | | |||||
* | | | Improve error handling when using partial name with hyphen. Fix #7079 | kennyj | 2012-08-03 | 1 | -7/+12 |
|/ / | |||||
* | | Merge pull request #7204 from frodsan/update_conventions | Rafael Mendonça França | 2012-07-31 | 1 | -8/+8 |
|\ \ | | | | | | | Follow code conventions in metal/live | ||||
| * | | update coding conventions in metal/live | Francesco Rodriguez | 2012-07-30 | 1 | -8/+8 |
| | | | |||||
* | | | fix nodoc in metal/live | Francesco Rodriguez | 2012-07-30 | 1 | -4/+4 |
|/ / | |||||
* | | fix typo in metal/live [ci skip] | Francesco Rodriguez | 2012-07-30 | 1 | -6/+6 |
| | | |||||
* | | Merge pull request #7198 from cfcosta/refactor-cache_control_headers | Rafael Mendonça França | 2012-07-29 | 1 | -11/+19 |
|\ \ | | | | | | | Refactor ActionDispatch::Http::Cache::Response#cache_control_headers | ||||
| * | | Refactor ActionDispatch::Http::Cache::Response#cache_control_headers. | Cainã Costa | 2012-07-30 | 1 | -11/+19 |
| | | | |||||
* | | | close the response when the response body is set so that normal render calls ↵ | Aaron Patterson | 2012-07-29 | 1 | -0/+5 |
| | | | | | | | | | | | | will work | ||||
* | | | header hash is duped before being sent up the rack stack | Aaron Patterson | 2012-07-29 | 2 | -12/+20 |
| | | | |||||
* | | | freeze the header object | Aaron Patterson | 2012-07-29 | 1 | -0/+5 |
| | | | |||||
* | | | make sure set_response! sets the correct response object | Aaron Patterson | 2012-07-29 | 1 | -0/+9 |
| | | | |||||
* | | | adding a more docs on closing response streams | Aaron Patterson | 2012-07-29 | 1 | -1/+4 |
| | | | |||||
* | | | pushing Buffer up to Live | Aaron Patterson | 2012-07-29 | 1 | -22/+22 |
| | | | |||||
* | | | adding some docs | Aaron Patterson | 2012-07-29 | 1 | -1/+26 |
| | | | |||||
* | | | Controller actions are processed in a separate thread for live | Aaron Patterson | 2012-07-29 | 2 | -4/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | responses. Processing controller actions in a separate thread allows us to work around the rack api - we can allow the user to set status and headers, then block until the first bytes are written. As soon as the first bytes are written, the main thread can return the status, headers, and (essentially) a queue for the body. | ||||
* | | | raise exceptions on header set after response committed | Aaron Patterson | 2012-07-29 | 2 | -0/+24 |
| | | | |||||
* | | | added live responses which can be written and read in separate threads | Aaron Patterson | 2012-07-29 | 2 | -0/+43 |
| | | | |||||
* | | | ActionController::DataStreaming::FileBody doesn't respond to #close. | Rafael Mendonça França | 2012-07-29 | 1 | -1/+1 |
| | | | |||||
* | | | flushing output should write to the stream rather than mutating the response ↵ | Aaron Patterson | 2012-07-29 | 2 | -9/+13 |
|/ / | | | | | | | object |