aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Remove deprecated use of ::instantiate_fixturesAlexey Muranov2012-05-101-4/+4
| | |
| * | Deprecate ::instantiate_fixtures unused parameterAlexey Muranov2012-05-101-3/+22
| | | | | | | | | | | | | | | | | | Deprecate the use of AcitiveRecord::Fixtures::instantiate_fixtures(object, fixture_set_name, fixture_set, load_instances = true), use instead instantiate_fixtures(object, fixture_set, load_instances = true). To be changed in master branch.
* | | Merge pull request #6149 from jmbejar/javascript_include_tag_with_not_duplicatesSantiago Pastorino2012-05-092-2/+8
|\ \ \ | |_|/ |/| | Make sure that javascript_include_tag/stylesheet_link_tag methods don't consider duplicated assets
| * | Make sure that javascript_include_tag/stylesheet_link_tag methods inJorge Bejar2012-05-032-2/+8
| | | | | | | | | | | | sprockets/helpers/rails_helper.rb discard duplicated assets
* | | Merge pull request #6219 from frodsan/fix_buildPiotr Sarnacki2012-05-091-1/+9
|\ \ \ | | | | | | | | Fix build - 3.2
| * | | Fix buildFrancesco Rodriguez2012-05-091-1/+9
| | | |
* | | | Merge pull request #6228 from mjtko/changelog-fixes-for-3-2-stableVijay Dev2012-05-091-1/+65
|\ \ \ \ | | | | | | | | | | Updated activesupport CHANGELOG [for 3-2-stable]
| * | | | Add CHANGELOG section for unreleased Rails 3.2.4; document addition of ↵Mark J. Titorenko2012-05-091-0/+6
| | | | | | | | | | | | | | | | | | | | #beginning_of_hour and #end_of_hour to Time and DateTime core extensions.
| * | | | Bring activesupport CHANGELOG up-to-date/consistent with master.Mark J. Titorenko2012-05-091-1/+59
|/ / / /
* | | | Merge pull request #6223 from ↵Andrew White2012-05-092-4/+6
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | carlosantoniodasilva/remove-columns-deprecation-ruby187 Stop showing deprecations for Ruby 1.8.7 with remove_column
| * | | Stop showing deprecations for Ruby 1.8.7 with remove_columnCarlos Antonio da Silva2012-05-092-4/+6
|/ / / | | | | | | | | | | | | String is Enumerable in 1.8.7, which means that passing a String to remove_column was generating deprecation warnings during tests.
* | | Merge pull request #6218 from frodsan/fix_docs_32stableVijay Dev2012-05-091-11/+11
|\ \ \ | |/ / |/| | Fix docs to support 1.8 syntax
| * | fix attribute_accessors docs to support 1.8 syntaxFrancesco Rodriguez2012-05-091-11/+11
|/ /
* | Merge pull request #6213 from frodsan/cut_docs_dupVijay Dev2012-05-081-23/+0
|\ \ | | | | | | Removing attribute_accessor docs duplication
| * | removing docs duplicationFrancesco Rodriguez2012-05-081-23/+0
|/ /
* | Merge pull request #6211 from frodsan/docs_attr_accessor_32stableVijay Dev2012-05-081-0/+111
|\ \ | | | | | | Adding docs to attribute accessor methods.
| * | added docs to attribute_accessors methodsFrancesco Rodriguez2012-05-081-0/+111
| |/
* | Merge pull request #6200 from arunagw/3-2-stableSantiago Pastorino2012-05-081-1/+1
|\ \ | | | | | | locking ruby-prof for now.
| * | locking ruby-prof until we got a fixArun Agrawal2012-05-081-1/+1
| | |
* | | Merge pull request #6198 from whistlerbrk/3-2-stableJosé Valim2012-05-072-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 Shah2012-05-071-1/+2
| | | | | | | | | | | | fallback
| * | Add failing test re #3436 which demonstrates content_type is not respected ↵Kunal Shah2012-05-071-0/+21
|/ / | | | | | | when using the :head method/shortcut
* | Merge pull request #6170 from mjtko/feature-beginning_of_hour-for-3-2-stableJeremy Kemper2012-05-055-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 DateTimeMark J. Titorenko2012-05-045-0/+56
| |/
* | Give more detailed instructions in script/rails in enginePiotr Sarnacki2012-05-041-0/+4
| | | | | | | | closes #4894
* | Merge pull request #6128 from frodsan/delete_all_limit_32Aaron Patterson2012-05-042-0/+6
|\ \ | | | | | | Fix #4979 against 3-2-stable
| * | Fix #4979 against 3-2-stable - delete_all raise an error if a limit is providedFrancesco Rodriguez2012-05-022-0/+6
| | |
* | | Merge pull request #4445 from nragaz/role_based_params_wrappingJosé Valim2012-05-042-4/+18
|\ \ \ | | | | | | | | specify a role for identifying accessible attributes when wrapping params
| * | | Add a role option to wrap_parameters.Nick Ragaz2012-05-042-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-stableVijay Dev2012-05-041-8/+10
|\ \ \ | |/ / |/| | improvements in "caching_with_rails" guide
| * | improvements in "caching_with_rails" guide - backported from docrailskucaahbe2012-05-041-8/+10
|/ / | | | | | | | | | | Conflicts: railties/guides/source/caching_with_rails.textile
* | Reset the request parameters after a constraints checkAndrew White2012-05-033-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_taskJeremy Kemper2012-05-022-0/+12
|\ \ | | | | | | Fix that asset precompile didn't respect the index.js convention. Fixes #3993.
| * | Added test for assets:precompile for index filesDmitry Vorotilin2012-05-011-0/+9
| | |
| * | Fix #3993 assets:precompile task does not detect index filesDmitry Vorotilin2012-05-011-0/+3
| | |
* | | Deprecate remove_column with array as an argumentPiotr Sarnacki2012-05-023-0/+19
|/ /
* | Correcting some confusion. Pago Pago is part of American Samoa, not Samoa.Dave Gerton2012-04-301-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 #6034Piotr Sarnacki2012-04-301-0/+20
| |
* | fix the Flash middleware loading the session on every request (very ↵Will Bryant2012-04-302-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/POSTAndrew White2012-04-301-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_helpersJeremy Kemper2012-04-299-18/+40
|\ \ | | | | | | Deprecate link_to_function and button_to_function
| * | Add release data to Rails 3.2.3Rafael Mendonça França2012-04-305-5/+5
| | |
| * | Add CHANGELOG entry.Rafael Mendonça França2012-04-301-1/+6
| | | | | | | | | | | | | | | Closes #5886 Closes #3093
| * | Deprecate link_to_function and button_to_function helpersRafael Mendonça França2012-04-302-12/+28
| | |
| * | Add missing require when helpers are used in isolationRafael Mendonça França2012-04-301-0/+1
|/ /
* | Restore interpolation of path option in redirect routesAndrew White2012-04-292-1/+50
| |
* | Add missing require from b608cdd64c95d0d16eb98d86562e22f3b01be9e3Andrew White2012-04-291-0/+1
| |
* | Escape interpolated params when redirecting - fixes #5688Andrew White2012-04-292-1/+34
| |
* | Merge pull request #6051 from rafaelfranca/fix_buildJosé Valim2012-04-292-3/+3
|\ \ | | | | | | Fix the build
| * | Remove warning of unused variableRafael Mendonça França2012-04-291-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 20:46:52 +0000