aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | :foreign_key option should be on has_many side of associationMikhail Dieterle2012-05-131-2/+2
| | | |
* | | | Merge pull request #6299 from guilleiguaran/upgrade-sprockets-3-2-stableSantiago Pastorino2012-05-131-1/+1
|\ \ \ \ | |/ / / |/| | | Upgrade sprockets to 2.1.3
| * | | Upgrade sprockets to 2.1.3Guillermo Iguaran2012-05-131-1/+1
|/ / /
* | | Merge pull request #6294 from frodsan/docs_backportVijay Dev2012-05-123-1/+22
|\ \ \ | | | | | | | | Adding examples and docs [3-2-stable]
| * | | adding examples and docsFrancesco Rodriguez2012-05-123-1/+22
|/ / /
* | | Merge pull request #6292 from erichmenge/3-2-stable-docfixRafael Mendonça França2012-05-121-1/+16
|\ \ \ | | | | | | | | 3 2 stable guides fix
| * | | Update 'getting started' guides for new whitelist security implementation. ↵Erich Menge2012-05-121-1/+16
|/ / / | | | | | | | | | Closes #6286.
* | | Merge pull request #6262 from arunagw/ruby_prof_fixSantiago Pastorino2012-05-112-2/+2
|\ \ \ | |/ / |/| | Ruby prof fix
| * | Ruby-Prof works with ruby-1.9.3 also.Arun Agrawal2012-05-111-1/+1
| | |
| * | Update performance profiler to work with latest ruby-profArun Agrawal2012-05-112-2/+2
|/ / | | | | | | Thanks to @carlosantoniodasilva
* | Return false for exists? with new records - fixes #6199.Andrew White2012-05-103-2/+3
| | | | | | | | (cherry picked from commit fa21b73ebb8339ad388f149c817c433b6254d490)
* | Don't ignore nil positional arguments for url helpers - fixes #6196.Andrew White2012-05-102-1/+35
| |
* | Refactor the handling of default_url_options in integration testsAndrew White2012-05-102-7/+104
| | | | | | | | | | | | | | | | | | | | | | | | This commit improves the handling of default_url_options in integration tests by making behave closer to how a real application operates. Specifically the following issues have been addressed: * Options specified in routes.rb are used (fixes #546) * Options specified in controllers are used * Request parameters are recalled correctly * Tests can override default_url_options directly
* | Merge pull request #6230 from spectator/active_resource_exceptionsJeremy Kemper2012-05-102-1/+1
|\ \ | | | | | | ActiveResource::TimeoutError is not loaded
| * | Make sure TimeoutError is loaded.Yury Velikanau2012-05-102-1/+1
| | |
* | | Merge pull request #6221 from ↵Jeremy Kemper2012-05-091-7/+26
|\ \ \ | | | | | | | | | | | | | | | | alexeymuranov/deprecate__instantiate_fixtures__arity Deprecate ActiveRecord::Fixtures.instantiate_fixtures unused parameter
| * | | 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
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 18:21:08 +0000