Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Touch option description grammatical error fixed [ci skip] | vadivelan | 2014-07-21 | 1 | -1/+1 | |
* | | Merge pull request #16227 from Aguynamedsteve/typo_correction | Yves Senn | 2014-07-19 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Fixed typo in comment | Steve | 2014-07-19 | 1 | -1/+1 | |
* | | | create_join_table uses same logic as HABTM reflections | Stefan Kanev | 2014-07-18 | 3 | -2/+13 | |
* | | | Merge pull request #15762 from arthurnn/better_error_on_bad_alias_method | Matthew Draper | 2014-07-18 | 1 | -8/+2 | |
|\ \ \ | ||||||
| * | | | Dont swallow errors when bad alias_method | Arthur Neves | 2014-06-24 | 1 | -8/+2 | |
* | | | | Prefer if/else for this case | Rafael Mendonça França | 2014-07-17 | 1 | -3/+2 | |
* | | | | Merge pull request #16188 from marianovalles/fix_rational_to_decimal_type_cast | Rafael Mendonça França | 2014-07-17 | 1 | -2/+5 | |
|\ \ \ \ | ||||||
| * | | | | Fix decimal_test module and add new test for object responding to to_d | Mariano Valles | 2014-07-16 | 1 | -1/+0 | |
| * | | | | Fix case statement to use ::Numeric and ::String | Mariano Valles | 2014-07-16 | 1 | -1/+1 | |
| * | | | | Change class evaluation for Rationals in cast_value | Mariano Valles | 2014-07-16 | 1 | -4/+6 | |
| * | | | | Fix rational to decimal on type_cast_from_user | Mariano Valles | 2014-07-16 | 1 | -1/+3 | |
* | | | | | Remove need for macro instance var | eileencodes | 2014-07-17 | 1 | -11/+14 | |
* | | | | | Remove unused 1:1 association :remote option | Chris Griego | 2014-07-16 | 1 | -1/+1 | |
* | | | | | Merge pull request #15944 from seuros/uuid | Rafael Mendonça França | 2014-07-16 | 1 | -1/+10 | |
|\ \ \ \ \ | ||||||
| * | | | | | Treat invalid uuid as nil | Abdelkader Boudih | 2014-07-14 | 1 | -1/+10 | |
* | | | | | | Merge pull request #16183 from goddamnhippie/fix-psych-warning | Rafael Mendonça França | 2014-07-16 | 1 | -0/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Move #encode_with to Relation | Gustavo Beathyate | 2014-07-15 | 2 | -4/+5 | |
| * | | | | | | Implement required #encode_with | Gustavo Beathyate | 2014-07-15 | 1 | -0/+4 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #15718 from chancancode/regression_from_15694 | Godfrey Chan | 2014-07-16 | 1 | -0/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fixed a regression introduced in 84cf156 | Godfrey Chan | 2014-06-14 | 1 | -0/+5 | |
* | | | | | | | nodoc enum hooks [ci skip] | Rafael Mendonça França | 2014-07-16 | 1 | -2/+2 | |
* | | | | | | | Merge pull request #16138 from sgrif/sg-attribute-set-key | Yves Senn | 2014-07-16 | 2 | -5/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | AttributeSet#include? -> AttributeSet#key? | Sean Griffin | 2014-07-11 | 2 | -5/+5 | |
* | | | | | | | | Move uuid_v5 and uuid_v3 to Digest::UUID | Rafael Mendonça França | 2014-07-15 | 1 | -2/+2 | |
* | | | | | | | | Merge pull request #16180 from rafaelfranca/rm-dirty | Rafael Mendonça França | 2014-07-15 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Deprecate ActiveModel::Dirty#reset_changes in favor of #clear_changes_informa... | Rafael Mendonça França | 2014-07-15 | 1 | -2/+2 | |
* | | | | | | | | | Merge branch 'master' of git://github.com/rails/rails | Godfrey Chan | 2014-07-15 | 3 | -6/+18 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Predicate methods don't need to return `true` / `false` | Rafael Mendonça França | 2014-07-15 | 1 | -1/+1 | |
| * | | | | | | | | Fix version detection for RENAME INDEX support. Fixes #15931. | Jeff Browning | 2014-07-15 | 3 | -6/+18 | |
* | | | | | | | | | Merge pull request #16162 from chancancode/fix_json_coder | Godfrey Chan | 2014-07-15 | 1 | -1/+1 | |
* | | | | | | | | | Revert "Revert "Merge pull request #16059 from jenncoop/json-serialized-attr"" | Godfrey Chan | 2014-07-15 | 2 | -1/+19 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #15266 from dv/use_counter_cache_for_empty_call | Godfrey Chan | 2014-07-15 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | If a counter_cache exists, use it for #empty? | David Verhasselt | 2014-06-10 | 1 | -0/+8 | |
* | | | | | | | | [CI SKIP] Doc fix. | Guo Xiang Tan | 2014-07-15 | 1 | -2/+2 | |
* | | | | | | | | Merge pull request #16089 from eileencodes/refactor-reflections-from-sub-clas... | Aaron Patterson | 2014-07-14 | 2 | -67/+128 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | Begin refactoring ThroughReflection | eileencodes | 2014-07-08 | 2 | -67/+128 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #16127 from Envek/fix_16111 | Matthew Draper | 2014-07-14 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | Dump PostgreSQL primary key with custom function as a default. | Andrey Novikov | 2014-07-11 | 1 | -1/+2 | |
| |/ / / / / | ||||||
* | | | | | | Fixing typo in comment | Gregory Igelmund | 2014-07-12 | 1 | -1/+1 | |
* | | | | | | Merge pull request #16136 from sgrif/sg-pg-bit-string | Matthew Draper | 2014-07-12 | 2 | -13/+33 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Don't rely on the column SQL type for bit string quoting | Sean Griffin | 2014-07-11 | 2 | -13/+33 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #16055 from sgrif/sg-refactor-sqlite3-strings | Matthew Draper | 2014-07-12 | 1 | -14/+22 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Use a type object for type casting behavior on SQLite3 | Sean Griffin | 2014-07-11 | 1 | -14/+22 | |
* | | | | | | Merge pull request #16071 from sgrif/sg-pg-type-cast | Rafael Mendonça França | 2014-07-08 | 1 | -15/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove PG's definition of `type_cast` | Sean Griffin | 2014-07-06 | 1 | -15/+0 | |
* | | | | | | | Merge pull request #16072 from sgrif/sg-xml-quoting | Rafael Mendonça França | 2014-07-08 | 4 | -4/+42 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Don't rely on the sql type to quote XML columns in PG | Sean Griffin | 2014-07-06 | 4 | -4/+42 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #16078 from tgxworld/retreive_connection_once | Rafael Mendonça França | 2014-07-07 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Avoid retrieving connection in ActiveRecord::QueryCache multiple times. | Guo Xiang Tan | 2014-07-07 | 1 | -2/+3 | |
| |/ / / / / / |