Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge pull request #23060 from schneems/schneems/revert-revert-migration-set-... | Richard Schneeman | 2016-01-15 | 2 | -19/+59 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix intermittent test failures | schneems | 2016-01-14 | 1 | -0/+1 | |
| * | | | | | | | | | Revert "Revert "Set environment even when no migration runs"" | schneems | 2016-01-14 | 2 | -19/+58 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #23065 from kamipo/clean_up_internal_metadata_definition | Richard Schneeman | 2016-01-15 | 2 | -4/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Clean up internal metadata definition | Ryuta Kamizono | 2016-01-15 | 2 | -4/+3 | |
* | | | | | | | | | | `last_insert_id_value` and `last_insert_id` are unused anymore | Ryuta Kamizono | 2016-01-15 | 1 | -9/+1 | |
| |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Revert "Set environment even when no migration runs" | Sean Griffin | 2016-01-14 | 2 | -58/+19 | |
* | | | | | | | | | Revert "Merge pull request #20835 from glittershark/if-and-unless-in-secure-t... | Kasper Timm Hansen | 2016-01-14 | 5 | -45/+2 | |
* | | | | | | | | | Merge pull request #23048 from kamipo/substitute_at_is_no_longer_used | Sean Griffin | 2016-01-14 | 6 | -20/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | `substitute_at` is no longer used | Ryuta Kamizono | 2016-01-14 | 6 | -20/+3 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Properly include the `from` clause when merging relations | Sean Griffin | 2016-01-14 | 2 | -0/+10 | |
* | | | | | | | | | Ensure enum scopes work properly with STI and inheritance | Sean Griffin | 2016-01-14 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #23017 from schneems/schneems/migration-sets-environment-v... | Richard Schneeman | 2016-01-14 | 2 | -19/+58 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Set environment even when no migration runs | schneems | 2016-01-11 | 2 | -1/+37 | |
| * | | | | | | | | | Clean up duplicate migration logic | schneems | 2016-01-11 | 2 | -18/+21 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | update doc for << method of has_many association | ankit1910 | 2016-01-14 | 1 | -0/+1 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | docs, formatting pass over changelogs. [ci skip] | Yves Senn | 2016-01-13 | 1 | -3/+3 | |
* | | | | | | | | fix regression when loading fixture files with symbol keys. | Yves Senn | 2016-01-13 | 4 | -2/+16 | |
* | | | | | | | | Improve error message for #or when it is structurally incompatible | Rafael Mendonça França | 2016-01-13 | 2 | -7/+11 | |
* | | | | | | | | Revert "Change `WhereClause#merge` to same named columns on diff tables" | Sean Griffin | 2016-01-12 | 2 | -25/+13 | |
* | | | | | | | | Change `WhereClause#merge` to same named columns on diff tables | Sean Griffin | 2016-01-12 | 2 | -13/+25 | |
* | | | | | | | | add migration versioning example to the changelog. [ci skip] | Yves Senn | 2016-01-12 | 1 | -0/+8 | |
* | | | | | | | | Merge pull request #23004 from matthewd/default-scope-sti | Matthew Draper | 2016-01-12 | 7 | -19/+61 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Skip the STI condition when evaluating a default scope | Matthew Draper | 2016-01-12 | 4 | -3/+24 | |
| * | | | | | | | | Active scopes apply to child classes, though not parents/siblings | Matthew Draper | 2016-01-12 | 3 | -16/+37 | |
| |/ / / / / / / | ||||||
* / / / / / / / | Allow manually setting environment value | schneems | 2016-01-11 | 2 | -6/+17 | |
|/ / / / / / / | ||||||
* | | | | | | | Extract `MySQL::TypeMetadata` class to `connection_adapters/mysql/type_metada... | Ryuta Kamizono | 2016-01-11 | 3 | -29/+35 | |
* | | | | | | | Extract `MySQL::Column` class to `connection_adapters/mysql/column.rb` | Ryuta Kamizono | 2016-01-11 | 3 | -56/+62 | |
* | | | | | | | Merge pull request #22992 from akshay-vishnoi/fix-docs | Sean Griffin | 2016-01-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [ci skip] fix typo | Akshay Vishnoi | 2016-01-10 | 1 | -1/+1 | |
* | | | | | | | | Split out token `if` tests to trigger `before_create`. | Kasper Timm Hansen | 2016-01-09 | 1 | -1/+5 | |
* | | | | | | | | Revert "Switch `has_secure_token` to `before_save`." | Kasper Timm Hansen | 2016-01-09 | 1 | -4/+3 | |
* | | | | | | | | Switch `has_secure_token` to `before_save`. | Kasper Timm Hansen | 2016-01-09 | 1 | -3/+4 | |
* | | | | | | | | Add conditional_token to users. | Kasper Timm Hansen | 2016-01-09 | 1 | -0/+1 | |
* | | | | | | | | Support :if and :unless in has_secure_token | Griffin Smith | 2016-01-09 | 4 | -2/+40 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #22988 from y-yagi/match_environment_variable_name_and_err... | Richard Schneeman | 2016-01-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | match the environment variable name that actually checking and error message | yuuji.yaginuma | 2016-01-09 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #22986 from yui-knk/fix_automatic_inverse_of_comment | प्रथमेश Sonpatki | 2016-01-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | [ci skip] `automatic_inverse_of` returns `false` not `nil` (document fix) | yui-knk | 2016-01-09 | 1 | -1/+1 | |
* | | | | | | | | Added missing CHANGELOG entry for https://github.com/rails/rails/pull/22976 | Prathamesh Sonpatki | 2016-01-09 | 1 | -0/+8 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #22976 from schneems/schneems/schema-migration-primary-key | Sean Griffin | 2016-01-08 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Get update_attributes working with SchemaMigration | schneems | 2016-01-08 | 2 | -3/+3 | |
* | | | | | | | | Fix the broken build | Sean Griffin | 2016-01-08 | 1 | -0/+2 | |
* | | | | | | | | Refactor tz aware types, add support for PG ranges | Sean Griffin | 2016-01-08 | 4 | -8/+63 | |
* | | | | | | | | Merge pull request #22967 from schneems/schneems/generic-metadata | Sean Griffin | 2016-01-08 | 13 | -7/+226 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fixing tests and re-locating error checking. | schneems | 2016-01-08 | 3 | -13/+14 | |
| * | | | | | | | Fix kwarg to not have circular dependency | schneems | 2016-01-08 | 1 | -1/+1 | |
| * | | | | | | | Use hash like syntax for InternalMetadata | schneems | 2016-01-08 | 6 | -14/+12 | |
| * | | | | | | | Add EnvironmentMismatchError | schneems | 2016-01-08 | 2 | -4/+25 | |
| * | | | | | | | Use `key` as primary key in schema. | schneems | 2016-01-08 | 1 | -1/+1 |