Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Avoid creation of extra hash with merge just to set a value | Carlos Antonio da Silva | 2013-11-15 | 1 | -1/+3 | |
| | | | | ||||||
* | | | | Fix test name [ci skip] | Carlos Antonio da Silva | 2013-11-14 | 2 | -3/+1 | |
| | | | | ||||||
* | | | | Fix AR Changelog examples and improve syntax highlight [ci skip] | Carlos Antonio da Silva | 2013-11-14 | 1 | -12/+12 | |
| | | | | ||||||
* | | | | Set branch for arel in Gemfile so that we can use bundle local config [ci skip] | Carlos Antonio da Silva | 2013-11-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #12862 from chancancode/json_gem_compat | Jeremy Kemper | 2013-11-14 | 3 | -3/+80 | |
|\ \ \ \ | | | | | | | | | | | JSON gem compatibility | |||||
| * | | | | Improved compatibility with the stdlib JSON gem. | Godfrey Chan | 2013-11-14 | 3 | -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 Hansson | 2013-11-14 | 4 | -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 Hansson | 2013-11-14 | 3 | -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-addendum | Rafael Mendonça França | 2013-11-14 | 2 | -8/+28 | |
|\ \ \ \ | | | | | | | | | | | Addendum to #12891 | |||||
| * | | | | Addendum to #12891 | Javan Makhmali | 2013-11-14 | 2 | -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_types | Rafael Mendonça França | 2013-11-14 | 1 | -3/+4 | |
|\ \ \ \ \ | | | | | | | | | | | | | Also dup `column_types` in AR::Result `initialize_copy` | |||||
| * | | | | | Also dup `column_types` in AR::Result `initialize_copy` | Vipul A M | 2013-11-10 | 1 | -3/+4 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #12892 from akshay-vishnoi/refactor | Rafael Mendonça França | 2013-11-14 | 1 | -9/+12 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | avoiding next statements | |||||
| * | | | | | avoiding next statements | Akshay Vishnoi | 2013-11-15 | 1 | -9/+12 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #12889 from kuldeepaggarwal/speed_ups | Rafael Mendonça França | 2013-11-14 | 4 | -9/+9 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Used Yield instead of block.call | |||||
| * | | | | | | Used Yield instead of block.call | Kuldeep Aggarwal | 2013-11-15 | 4 | -9/+9 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #12891 from javan/to-param | David Heinemeier Hansson | 2013-11-14 | 4 | -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 Makhmali | 2013-11-14 | 4 | -0/+65 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attribute or method. | |||||
* | | | | | | | | Merge pull request #12890 from akshay-vishnoi/refactor | Rafael Mendonça França | 2013-11-14 | 1 | -6/+6 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | class methods moved to already defined class<<self block | |||||
| * | | | | | | class methods moved to already defined class<<self block | Akshay Vishnoi | 2013-11-15 | 1 | -6/+6 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #12886 from akshay-vishnoi/refactor | Xavier Noria | 2013-11-14 | 1 | -5/+1 | |
|\| | | | | | | | | | | | | | | | | | | | | #presence used | |||||
| * | | | | | | #presence used | Akshay Vishnoi | 2013-11-14 | 1 | -5/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #12861 from route/missed_require_for_module | Xavier Noria | 2013-11-14 | 2 | -3/+0 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Clean up `require ‘active_support/deprecation’` and remove circular require | |||||
| * | | | | | | | Clean up `require ‘active_support/deprecation’` and remove circular require | Dmitry Vorotilin | 2013-11-14 | 2 | -3/+0 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #12832 from vipulnsward/move_schema_creation | Yves Senn | 2013-11-14 | 2 | -78/+84 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Move `SchemaCreation` to its own file instead of `AbstractAdapter`. | |||||
| * | | | | | | | Move `SchemaCreation` to its own file instead of `AbstractAdapter`. | Vipul A M | 2013-11-12 | 2 | -78/+84 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #12884 from akshay-vishnoi/refactor | Guillermo Iguaran | 2013-11-14 | 4 | -5/+5 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Ruby's new Hash syntax applied in actionmailer | |||||
| * | | | | | | Ruby's new Hash syntax applied in actionmailer | Mr A | 2013-11-14 | 4 | -5/+5 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #12845 from amatsuda/should_ar_depend_on_rails | Guillermo Iguaran | 2013-11-13 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Refer to Rails.env from AR only when Rails is defined | |||||
| * | | | | | | | Refer to Rails.env only when Rails is defined | Akira Matsuda | 2013-11-11 | 1 | -1/+5 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #12883 from Amit-Thawait/master | Guillermo Iguaran | 2013-11-13 | 0 | -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 Thawait | 2013-11-14 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Get rid of unused variable | Guillermo Iguaran | 2013-11-14 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #12882 from charliesome/use-rescue-splat-in-suppress | Guillermo Iguaran | 2013-11-13 | 1 | -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 filtering | Charlie Somerville | 2013-11-13 | 1 | -2/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #12874 from chancancode/better_as_loading_guides | Rafael Mendonça França | 2013-11-13 | 1 | -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 Chan | 2013-11-13 | 1 | -1/+4 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #12772 from dmathieu/no_touching | Rafael Mendonça França | 2013-11-13 | 5 | -0/+112 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Add No Touching | |||||
| * | | | | | | | | | add #no_touching on ActiveRecord models | Damien Mathieu | 2013-11-13 | 5 | -0/+112 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | fix weird Emacs auto indentation. [ci skip] | Yves Senn | 2013-11-13 | 1 | -8/+8 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | tests for merging Relations of different classes. | Yves Senn | 2013-11-13 | 1 | -0/+19 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | move Relation#merge tests into separate file. | Yves Senn | 2013-11-13 | 2 | -121/+131 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #12870 from sauliusg/atom-feed-doc-fix | Yves Senn | 2013-11-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix syntax error in atom_feed example [ci skip] | |||||
| * | | | | | | | | | | Fix syntax error in atom_feed example [ci skip] | Saulius Grigaliunas | 2013-11-13 | 1 | -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 all | Akira Matsuda | 2013-11-13 | 1 | -0/+7 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Revert "`remove_column` does not take a type argument. [ci skip]. Closes #12864" | Yves Senn | 2013-11-13 | 1 | -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-render | Carlos Antonio da Silva | 2013-11-12 | 1 | -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 Fatas | 2013-11-13 | 1 | -4/+3 | |
|/ / / / / / / / / / | ||||||
* / / / / / / / / / | `remove_column` does not take a type argument. [ci skip]. Closes #12864 | Yves Senn | 2013-11-12 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #11921 from Empact/sqlite-3-cleanup | Yves Senn | 2013-11-12 | 2 | -12/+1 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove the unused, undocumented SQLite3Adapter#supports_count_distinct? |