aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Improved compatibility with the stdlib JSON gem.Godfrey Chan2013-11-143-3/+80
| | | | | | | | | | | | Previously, calling `::JSON.{generate,dump}` sometimes causes unexpected failures such as intridea/multi_json#86. `::JSON.{generate,dump}` now bypasses the ActiveSupport JSON encoder completely and yields the same result with or without ActiveSupport. This means that it will **not** call `as_json` and will ignore any options that the JSON gem does not natively understand. To invoke ActiveSupport's JSON encoder instead, use `obj.to_json(options)` or `ActiveSupport::JSON.encode(obj, options)`.
* Revert "Used Yield instead of block.call" -- this causes all of ↵David Heinemeier Hansson2013-11-144-9/+9
| | | | | | atom_feed_helper_test.rb to fail with "SystemStackError: stack level too deep". This reverts commit d3a1ce1cdc60d593de1682c5f4e3230c8db9a0fd.
* Fix that eager loading of polymorphic associations did not work with ↵David Heinemeier Hansson2013-11-143-4/+10
| | | | association empty?/any? predicates any more (there is still a problem when select is applied to a relation, or if you try association#exists? -- but its easier to work around)
* Merge pull request #12893 from javan/to-param-addendumRafael Mendonça França2013-11-142-8/+28
|\ | | | | Addendum to #12891
| * Addendum to #12891Javan Makhmali2013-11-142-8/+28
| | | | | | | | | | | | * Fix incorrectly named tests * Restore Object#to_param behavior * Ensure param is derived from a squished and truncated string
* | Merge pull request #12819 from vipulnsward/also_dup_column_typesRafael Mendonça França2013-11-141-3/+4
|\ \ | | | | | | Also dup `column_types` in AR::Result `initialize_copy`
| * | Also dup `column_types` in AR::Result `initialize_copy`Vipul A M2013-11-101-3/+4
| | |
* | | Merge pull request #12892 from akshay-vishnoi/refactorRafael Mendonça França2013-11-141-9/+12
|\ \ \ | |_|/ |/| | avoiding next statements
| * | avoiding next statementsAkshay Vishnoi2013-11-151-9/+12
| | |
* | | Merge pull request #12889 from kuldeepaggarwal/speed_upsRafael Mendonça França2013-11-144-9/+9
|\ \ \ | | | | | | | | Used Yield instead of block.call
| * | | Used Yield instead of block.callKuldeep Aggarwal2013-11-154-9/+9
| | | |
* | | | Merge pull request #12891 from javan/to-paramDavid Heinemeier Hansson2013-11-144-0/+65
|\ \ \ \ | | | | | | | | | | Add AR::Base.to_param for convenient "pretty" URLs derived from a model's attribute or method
| * | | | Add AR::Base.to_param for convenient "pretty" URLs derived from a model's ↵Javan Makhmali2013-11-144-0/+65
| | | | | | | | | | | | | | | | | | | | attribute or method.
* | | | | Merge pull request #12890 from akshay-vishnoi/refactorRafael Mendonça França2013-11-141-6/+6
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | class methods moved to already defined class<<self block
| * | | class methods moved to already defined class<<self blockAkshay Vishnoi2013-11-151-6/+6
| | | |
* | | | Merge pull request #12886 from akshay-vishnoi/refactorXavier Noria2013-11-141-5/+1
|\| | | | | | | | | | | #presence used
| * | | #presence usedAkshay Vishnoi2013-11-141-5/+1
| | | |
* | | | Merge pull request #12861 from route/missed_require_for_moduleXavier Noria2013-11-142-3/+0
|\ \ \ \ | | | | | | | | | | Clean up `require ‘active_support/deprecation’` and remove circular require
| * | | | Clean up `require ‘active_support/deprecation’` and remove circular requireDmitry Vorotilin2013-11-142-3/+0
| | | | |
* | | | | Merge pull request #12832 from vipulnsward/move_schema_creationYves Senn2013-11-142-78/+84
|\ \ \ \ \ | |/ / / / |/| | | | Move `SchemaCreation` to its own file instead of `AbstractAdapter`.
| * | | | Move `SchemaCreation` to its own file instead of `AbstractAdapter`.Vipul A M2013-11-122-78/+84
| | |_|/ | |/| |
* | | | Merge pull request #12884 from akshay-vishnoi/refactorGuillermo Iguaran2013-11-144-5/+5
|\ \ \ \ | | |/ / | |/| | Ruby's new Hash syntax applied in actionmailer
| * | | Ruby's new Hash syntax applied in actionmailerMr A2013-11-144-5/+5
| | | |
* | | | Merge pull request #12845 from amatsuda/should_ar_depend_on_railsGuillermo Iguaran2013-11-131-1/+5
|\ \ \ \ | | | | | | | | | | Refer to Rails.env from AR only when Rails is defined
| * | | | Refer to Rails.env only when Rails is definedAkira Matsuda2013-11-111-1/+5
| | | | |
* | | | | Merge pull request #12883 from Amit-Thawait/masterGuillermo Iguaran2013-11-130-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Updated guides link for 3.2.x to latest stable version 3.2.15 [ci skip]
| * | | | | Updated guides link for 3.2.x to latest stable version 3.2.15 [skip-ci]Amit Thawait2013-11-141-1/+1
| | | | | |
* | | | | | Get rid of unused variableGuillermo Iguaran2013-11-141-1/+1
| | | | | |
* | | | | | Merge pull request #12882 from charliesome/use-rescue-splat-in-suppressGuillermo Iguaran2013-11-131-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use rescue with a splat rather and catching all exceptions and manually filtering in Kernel#suppress
| * | | | | | Use rescue with a splat rather and catching all and filteringCharlie Somerville2013-11-131-2/+1
| | | | | | |
* | | | | | | Merge pull request #12874 from chancancode/better_as_loading_guidesRafael Mendonça França2013-11-131-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make it clear that require 'active_support' is required [ci-skip]
| * | | | | | | Make it clear that require 'active_support' is required [ci-skip]Godfrey Chan2013-11-131-1/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #12772 from dmathieu/no_touchingRafael Mendonça França2013-11-135-0/+112
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Add No Touching
| * | | | | | add #no_touching on ActiveRecord modelsDamien Mathieu2013-11-135-0/+112
| | | | | | |
* | | | | | | fix weird Emacs auto indentation. [ci skip]Yves Senn2013-11-131-8/+8
| | | | | | |
* | | | | | | tests for merging Relations of different classes.Yves Senn2013-11-131-0/+19
| | | | | | |
* | | | | | | move Relation#merge tests into separate file.Yves Senn2013-11-132-121/+131
| | | | | | |
* | | | | | | Merge pull request #12870 from sauliusg/atom-feed-doc-fixYves Senn2013-11-131-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix syntax error in atom_feed example [ci skip]
| * | | | | | | Fix syntax error in atom_feed example [ci skip]Saulius Grigaliunas2013-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Builder's #tag! takes either String or Symbol as the first parameter
* | | | | | | | Ensure that a column added in a test is being removed after allAkira Matsuda2013-11-131-0/+7
|/ / / / / / /
* | | | | | | Revert "`remove_column` does not take a type argument. [ci skip]. Closes #12864"Yves Senn2013-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of Rails 4.0 `remove_column` is no longer an alias for `remove_columns`. The type is actually valid and used when issuing a rollback (new `change` method). This reverts commit 9c9d4948e428a226a19aa92c17fa6ac5833c2fb8.
* | | | | | | Merge pull request #12865 from JuanitoFatas/layout-and-renderCarlos Antonio da Silva2013-11-121-4/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Fix curl response output and use strong parameters in update action
| * | | | | | | [ci skip] Fix curl response output and use strong parameters in update action.Juanito Fatas2013-11-131-4/+3
|/ / / / / / /
* / / / / / / `remove_column` does not take a type argument. [ci skip]. Closes #12864Yves Senn2013-11-121-1/+1
|/ / / / / /
* | | | | | Merge pull request #11921 from Empact/sqlite-3-cleanupYves Senn2013-11-122-12/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove the unused, undocumented SQLite3Adapter#supports_count_distinct?
| * | | | | | Remove the unused, undocumented SQLite3Adapter#supports_count_distinct?Ben Woosley2013-11-121-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This has returned true since 3cc9b5f1, and is not used internally.
| * | | | | | Drop a sqlite_version check because we only support SQLite 3.6.16 or newer.Ben Woosley2013-11-122-7/+1
|/ / / / / / | | | | | | | | | | | | Drop some comments that document the implementation rather than the interface.
* | | | | | Merge pull request #12695 from mikepack/allow_pathnamesYves Senn2013-11-113-1/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow Pathnames to be added to eager load paths
| * | | | | | Allow Pathnames to be added to eager load pathsMike Pack2013-11-113-1/+19
| | | | | | |
* | | | | | | Merge pull request #12851 from RKushnir/masterYves Senn2013-11-112-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Include URL helpers in TestController in bug report templates [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 17:01:43 +0000