Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10848 from 907th/add_block_to_cattr_reader | Rafael Mendonça França | 2013-11-15 | 4 | -0/+40 |
|\ | | | | | Fix #10847: allow to pass a block to `cattr_reader`. | ||||
| * | Unify `cattr_*` interface: allow to pass a block to `cattr_reader`. | Alexey Chernenkov | 2013-11-15 | 4 | -0/+40 |
| | | | | | | | | | | | | | | | | | | Example: class A cattr_reader(:defr) { 'default_reader_value' } end A.defr # => 'default_reader_value' | ||||
* | | explain how `to_param` wil truncate long values. [ci skip] refs #12900. | Yves Senn | 2013-11-15 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #12900 from kuldeepaggarwal/f-to-param | Rafael Mendonça França | 2013-11-15 | 2 | -0/+10 |
|\ \ | | | | | | | added one test case and example for ActiveRecord::Base.to_param method | ||||
| * | | added one test case and example for ActiveRecord::Base.to_param method | Kuldeep Aggarwal | 2013-11-15 | 2 | -0/+10 |
| |/ | |||||
* | | Merge pull request #12899 from nateberkopec/remove_broken_internal_guide_link | Rafael Mendonça França | 2013-11-15 | 1 | -2/+0 |
|\ \ | |/ |/| | Remove broken Commmand Line guide link | ||||
| * | Remove broken Commmand Line guide link | Nate Berkopec | 2013-11-15 | 1 | -2/+0 |
|/ | | | [ci skip] | ||||
* | Merge pull request #12898 from chocoby/fix/changelog_comment | Carlos Antonio da Silva | 2013-11-15 | 1 | -1/+1 |
|\ | | | | | Fix CHANGELOG typo [ci skip] | ||||
| * | Fix CHANGELOG typo [ci skip] | chocoby | 2013-11-15 | 1 | -1/+1 |
| | | |||||
* | | Avoid hash lookups for building an array of required defaults | Carlos Antonio da Silva | 2013-11-15 | 1 | -2/+3 |
| | | | | | | | | Only set the value once after it's calculated. | ||||
* | | Get rid of useless temp variable | Carlos Antonio da Silva | 2013-11-15 | 1 | -2/+1 |
| | | |||||
* | | Set values instead of building hashes with single values for merging | Carlos Antonio da Silva | 2013-11-15 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #9599 from ognevsky/hash-inside-array-in-url-for | Andrew White | 2013-11-15 | 4 | -0/+31 |
|\ | | | | | Take Hash with options inside Array in #url_for | ||||
| * | Take Hash with options inside Array in #url_for | Andrey Ognevsky | 2013-11-15 | 4 | -0/+31 |
|/ | |||||
* | document id prefixed String usage of `.find`. refs #12891 [ci skip] | Yves Senn | 2013-11-15 | 1 | -5/+6 |
| | |||||
* | Remove short circuit return in favor of simple conditional | Carlos Antonio da Silva | 2013-11-15 | 1 | -4/+7 |
| | |||||
* | Invert conditional to avoid double checking for Regexp | Carlos Antonio da Silva | 2013-11-15 | 1 | -11/+12 |
| | |||||
* | Only check that the option exists once instead of doing on each conditional | Carlos Antonio da Silva | 2013-11-15 | 1 | -8/+9 |
| | |||||
* | Remove argument that is accessible as attribute | Carlos Antonio da Silva | 2013-11-15 | 1 | -3/+3 |
| | |||||
* | Cache regexp source on format validation to avoid allocating new objects | Carlos Antonio da Silva | 2013-11-15 | 1 | -2/+2 |
| | | | | | | | | | Example: >> r = /some-regexp/ => /some-regexp/ >> r.source.object_id == r.source.object_id => false | ||||
* | Make code simpler to read by using a case statement | Carlos Antonio da Silva | 2013-11-15 | 1 | -2/+6 |
| | |||||
* | Avoid a new hash allocation | Carlos Antonio da Silva | 2013-11-15 | 1 | -1/+1 |
| | |||||
* | Use a simple conditional rather than short circuit with next | Carlos Antonio da Silva | 2013-11-15 | 1 | -2/+3 |
| | |||||
* | Simplify number parsing logic in numericality validation | Carlos Antonio da Silva | 2013-11-15 | 1 | -10/+3 |
| | |||||
* | 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 |
| | |_|/ | |/| | |