Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | removing docs duplication | Francesco Rodriguez | 2012-05-08 | 1 | -23/+0 |
| | |||||
* | Merge pull request #6211 from frodsan/docs_attr_accessor_32stable | Vijay Dev | 2012-05-08 | 1 | -0/+111 |
|\ | | | | | Adding docs to attribute accessor methods. | ||||
| * | added docs to attribute_accessors methods | Francesco Rodriguez | 2012-05-08 | 1 | -0/+111 |
| | | |||||
* | | Merge pull request #6200 from arunagw/3-2-stable | Santiago Pastorino | 2012-05-08 | 1 | -1/+1 |
|\ \ | | | | | | | locking ruby-prof for now. | ||||
| * | | locking ruby-prof until we got a fix | Arun Agrawal | 2012-05-08 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #6198 from whistlerbrk/3-2-stable | José Valim | 2012-05-07 | 2 | -1/+23 |
|\ \ \ | |/ / |/| | | Address ActionPack head method not respecting explicitly set content-type #3436 | ||||
| * | | If content_type is explicitly passed to the :head method use the value or ↵ | Kunal Shah | 2012-05-07 | 1 | -1/+2 |
| | | | | | | | | | | | | fallback | ||||
| * | | Add failing test re #3436 which demonstrates content_type is not respected ↵ | Kunal Shah | 2012-05-07 | 1 | -0/+21 |
|/ / | | | | | | | when using the :head method/shortcut | ||||
* | | Merge pull request #6170 from mjtko/feature-beginning_of_hour-for-3-2-stable | Jeremy Kemper | 2012-05-05 | 5 | -0/+56 |
|\ \ | | | | | | | Backport beginning and end of hour support for Time and DateTime to 3-2-stable | ||||
| * | | added beginning_of_hour support to core_ext calculations for Time and DateTime | Mark J. Titorenko | 2012-05-04 | 5 | -0/+56 |
| |/ | |||||
* | | Give more detailed instructions in script/rails in engine | Piotr Sarnacki | 2012-05-04 | 1 | -0/+4 |
| | | | | | | | | closes #4894 | ||||
* | | Merge pull request #6128 from frodsan/delete_all_limit_32 | Aaron Patterson | 2012-05-04 | 2 | -0/+6 |
|\ \ | | | | | | | Fix #4979 against 3-2-stable | ||||
| * | | Fix #4979 against 3-2-stable - delete_all raise an error if a limit is provided | Francesco Rodriguez | 2012-05-02 | 2 | -0/+6 |
| | | | |||||
* | | | Merge pull request #4445 from nragaz/role_based_params_wrapping | José Valim | 2012-05-04 | 2 | -4/+18 |
|\ \ \ | | | | | | | | | specify a role for identifying accessible attributes when wrapping params | ||||
| * | | | Add a role option to wrap_parameters. | Nick Ragaz | 2012-05-04 | 2 | -4/+18 |
| | |/ | |/| | | | | | | | The role option identifies which parameters are accessible and should be wrapped. The default role is :default. | ||||
* | | | Merge pull request #6158 from Dagnan/3-2-stable | Vijay Dev | 2012-05-04 | 1 | -8/+10 |
|\ \ \ | |/ / |/| | | improvements in "caching_with_rails" guide | ||||
| * | | improvements in "caching_with_rails" guide - backported from docrails | kucaahbe | 2012-05-04 | 1 | -8/+10 |
|/ / | | | | | | | | | | | Conflicts: railties/guides/source/caching_with_rails.textile | ||||
* | | Reset the request parameters after a constraints check | Andrew White | 2012-05-03 | 3 | -0/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | A callable object passed as a constraint for a route may access the request parameters as part of its check. This causes the combined parameters hash to be cached in the environment hash. If the constraint fails then any subsequent access of the request parameters will be against that stale hash. To fix this we delete the cache after every call to `matches?`. This may have a negative performance impact if the contraint wraps a large number of routes as the parameters hash is built by merging GET, POST and path parameters. Fixes #2510. (cherry picked from commit 56030506563352944fed12a6bb4793bb2462094b) | ||||
* | | Merge pull request #6095 from route/assets_precompile_task | Jeremy Kemper | 2012-05-02 | 2 | -0/+12 |
|\ \ | | | | | | | Fix that asset precompile didn't respect the index.js convention. Fixes #3993. | ||||
| * | | Added test for assets:precompile for index files | Dmitry Vorotilin | 2012-05-01 | 1 | -0/+9 |
| | | | |||||
| * | | Fix #3993 assets:precompile task does not detect index files | Dmitry Vorotilin | 2012-05-01 | 1 | -0/+3 |
| | | | |||||
* | | | Deprecate remove_column with array as an argument | Piotr Sarnacki | 2012-05-02 | 3 | -0/+19 |
|/ / | |||||
* | | Correcting some confusion. Pago Pago is part of American Samoa, not Samoa. | Dave Gerton | 2012-04-30 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | Further, Samoa and Tokelau jumped across the IDL from Dec 29 to Dec 31, 2011 switching from UTC-11 to UTC+13. American Samoa did not make the change and remains at UTC-11. Pacific/Fakaofo and Pacific/Apia are in TZInfo and documentation about the dateline change is in austalasia at IANA. (cherry picked from commit 1d08ce5f56e45fdee41bb16b2d8d4464bc69bf22) | ||||
* | | Failing test for #6034 | Piotr Sarnacki | 2012-04-30 | 1 | -0/+20 |
| | | |||||
* | | fix the Flash middleware loading the session on every request (very ↵ | Will Bryant | 2012-04-30 | 2 | -7/+3 |
| | | | | | | | | dangerous especially with Rack::Cache), it should only be loaded when the flash method is called | ||||
* | | Add note about using 303 See Other for XHR requests other than GET/POST | Andrew White | 2012-04-30 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IE since version 6 and recently Chrome and Firefox have started following 302 redirects from XHR requests other than GET/POST using the original request method. This can lead to DELETE requests being redirected amongst other things. Although it doesn't directly affect the Rails framework since it doesn't return a 302 redirect to any non-GET/POST request a note has been added to raise awareness of the issue. Some references: Original article from @technoweenie: http://techno-weenie.net/2011/8/19/ie9-deletes-stuff/ Hacker News discussion of the article: http://news.ycombinator.com/item?id=2903493 WebKit bug report: https://bugs.webkit.org/show_bug.cgi?id=46183 Firefox bug report and changeset: https://bugzilla.mozilla.org/show_bug.cgi?id=598304 https://hg.mozilla.org/mozilla-central/rev/9525d7e2d20d Chrome bug report: http://code.google.com/p/chromium/issues/detail?id=56373 HTTPbis bug report and changeset: http://trac.tools.ietf.org/wg/httpbis/trac/ticket/160 http://trac.tools.ietf.org/wg/httpbis/trac/changeset/1428 Roy T. Fielding's history of the issue: http://ftp.ics.uci.edu/pub/ietf/http/hypermail/1997q3/0611.html Automated browser tests for the issue: http://www.mnot.net/javascript/xmlhttprequest/ Fixes #4144 (cherry picked from commit 24f143789a8989f3bccde14ff28067de25cafd87) | ||||
* | | Merge pull request #5922 from rafaelfranca/deprecate_javascript_helpers | Jeremy Kemper | 2012-04-29 | 9 | -18/+40 |
|\ \ | | | | | | | Deprecate link_to_function and button_to_function | ||||
| * | | Add release data to Rails 3.2.3 | Rafael Mendonça França | 2012-04-30 | 5 | -5/+5 |
| | | | |||||
| * | | Add CHANGELOG entry. | Rafael Mendonça França | 2012-04-30 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | Closes #5886 Closes #3093 | ||||
| * | | Deprecate link_to_function and button_to_function helpers | Rafael Mendonça França | 2012-04-30 | 2 | -12/+28 |
| | | | |||||
| * | | Add missing require when helpers are used in isolation | Rafael Mendonça França | 2012-04-30 | 1 | -0/+1 |
|/ / | |||||
* | | Restore interpolation of path option in redirect routes | Andrew White | 2012-04-29 | 2 | -1/+50 |
| | | |||||
* | | Add missing require from b608cdd64c95d0d16eb98d86562e22f3b01be9e3 | Andrew White | 2012-04-29 | 1 | -0/+1 |
| | | |||||
* | | Escape interpolated params when redirecting - fixes #5688 | Andrew White | 2012-04-29 | 2 | -1/+34 |
| | | |||||
* | | Merge pull request #6051 from rafaelfranca/fix_build | José Valim | 2012-04-29 | 2 | -3/+3 |
|\ \ | | | | | | | Fix the build | ||||
| * | | Remove warning of unused variable | Rafael Mendonça França | 2012-04-29 | 1 | -1/+1 |
| | | | |||||
| * | | Fix the build. | Rafael Mendonça França | 2012-04-29 | 1 | -2/+2 |
|/ / | | | | | | | | | * The method for persisted records in 3-2-branch is 'PUT' * size is generated by default in inputs | ||||
* | | Don't convert params if the request isn't HTML - fixes #5341 | Andrew White | 2012-04-29 | 2 | -8/+58 |
| | | | | | | | | | | | | | | | | (cherry picked from commit 7a80b69e00f68e673c6ceb5cc684aa9196ed3d9f) Conflicts: actionpack/test/controller/test_test.rb | ||||
* | | Lazy load `default_form_builder` if it's passed as a string | Piotr Sarnacki | 2012-04-28 | 4 | -2/+27 |
| | | | | | | | | closes #3341 | ||||
* | | Allow Thor 0.15 and 1.0, to be released shortly | tomhuda | 2012-04-28 | 1 | -1/+5 |
|/ | |||||
* | Merge pull request #6038 from arunagw/warning_removed_3-2-stable | Piotr Sarnacki | 2012-04-28 | 1 | -1/+0 |
|\ | | | | | Warning removed 3 2 stable | ||||
| * | Remove circular require of time/zones | Oscar Del Ben | 2012-04-29 | 1 | -1/+0 |
|/ | |||||
* | Merge pull request #6022 from sikachu/3-2-stable-record_tag_backport | Aaron Patterson | 2012-04-27 | 2 | -2/+8 |
|\ | | | | | Do not mutate options hash | ||||
| * | Do not mutate options hash | Carlos Antonio da Silva | 2012-04-27 | 2 | -2/+8 |
|/ | |||||
* | Merge pull request #4528 from j-manu/log-tailer-fix | Aaron Patterson | 2012-04-27 | 1 | -3/+7 |
| | | | | Fix for log tailer when the log file doesn't exist. | ||||
* | fix number_to_human docs [ci skip] | Vijay Dev | 2012-04-26 | 1 | -2/+2 |
| | |||||
* | Merge pull request #5971 from carlosantoniodasilva/fix-build-3-2 | Jeremy Kemper | 2012-04-24 | 1 | -1/+1 |
|\ | | | | | Add extra order clause to fix failing test on Ruby 1.8.7 | ||||
| * | Add extra order clause to fix failing test on Ruby 1.8.7 | Carlos Antonio da Silva | 2012-04-24 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #5968 from sikachu/3-2-stable-backport | Jeremy Kemper | 2012-04-24 | 2 | -3/+9 |
|\ | | | | | Backport workarounds for Mocha behavior changes. | ||||
| * | Fix build. It seems that the Mocha's behavior were changed. | kennyj | 2012-04-24 | 2 | -3/+9 |
|/ |