| Commit message (Expand) | Author | Age | Files | Lines |
* | Revert "Set environment even when no migration runs" | Sean Griffin | 2016-01-14 | 1 | -30/+18 |
* | Revert "Merge pull request #20835 from glittershark/if-and-unless-in-secure-t... | Kasper Timm Hansen | 2016-01-14 | 1 | -23/+2 |
* | Merge pull request #23048 from kamipo/substitute_at_is_no_longer_used | Sean Griffin | 2016-01-14 | 3 | -9/+2 |
|\ |
|
| * | `substitute_at` is no longer used | Ryuta Kamizono | 2016-01-14 | 3 | -9/+2 |
* | | Properly include the `from` clause when merging relations | Sean Griffin | 2016-01-14 | 1 | -0/+3 |
* | | 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 | 1 | -18/+30 |
|\ \ |
|
| * | | Set environment even when no migration runs | schneems | 2016-01-11 | 1 | -1/+10 |
| * | | Clean up duplicate migration logic | schneems | 2016-01-11 | 1 | -17/+20 |
* | | | update doc for << method of has_many association | ankit1910 | 2016-01-14 | 1 | -0/+1 |
| |/
|/| |
|
* | | fix regression when loading fixture files with symbol keys. | Yves Senn | 2016-01-13 | 1 | -2/+3 |
* | | Improve error message for #or when it is structurally incompatible | Rafael Mendonça França | 2016-01-13 | 1 | -6/+8 |
* | | Revert "Change `WhereClause#merge` to same named columns on diff tables" | Sean Griffin | 2016-01-12 | 1 | -10/+11 |
* | | Change `WhereClause#merge` to same named columns on diff tables | Sean Griffin | 2016-01-12 | 1 | -11/+10 |
* | | Merge pull request #23004 from matthewd/default-scope-sti | Matthew Draper | 2016-01-12 | 3 | -14/+20 |
|\ \ |
|
| * | | Skip the STI condition when evaluating a default scope | Matthew Draper | 2016-01-12 | 2 | -3/+3 |
| * | | Active scopes apply to child classes, though not parents/siblings | Matthew Draper | 2016-01-12 | 1 | -11/+17 |
| |/ |
|
* / | 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 | 2 | -28/+34 |
* | Extract `MySQL::Column` class to `connection_adapters/mysql/column.rb` | Ryuta Kamizono | 2016-01-11 | 2 | -46/+52 |
* | 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 |
* | | 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 |
* | | Support :if and :unless in has_secure_token | Griffin Smith | 2016-01-09 | 1 | -2/+23 |
|/ |
|
* | 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 |
* | | [ci skip] `automatic_inverse_of` returns `false` not `nil` (document fix) | yui-knk | 2016-01-09 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #22976 from schneems/schneems/schema-migration-primary-key | Sean Griffin | 2016-01-08 | 1 | -1/+1 |
|\ |
|
| * | Get update_attributes working with SchemaMigration | schneems | 2016-01-08 | 1 | -1/+1 |
* | | 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 | 3 | -8/+21 |
* | | Merge pull request #22967 from schneems/schneems/generic-metadata | Sean Griffin | 2016-01-08 | 10 | -7/+150 |
|\ \
| |/
|/| |
|
| * | Fixing tests and re-locating error checking. | schneems | 2016-01-08 | 2 | -9/+10 |
| * | Fix kwarg to not have circular dependency | schneems | 2016-01-08 | 1 | -1/+1 |
| * | Use hash like syntax for InternalMetadata | schneems | 2016-01-08 | 4 | -11/+9 |
| * | Add EnvironmentMismatchError | schneems | 2016-01-08 | 2 | -4/+25 |
| * | Use `key` as primary key in schema. | schneems | 2016-01-08 | 1 | -1/+1 |
| * | [ci skip] Add comment to remove silenced code. | schneems | 2016-01-07 | 1 | -0/+1 |
| * | Prevent destructive action on production database | schneems | 2016-01-07 | 9 | -7/+129 |
* | | Merge pull request #22973 from kamipo/fix_select_values_method_signature | Rafael França | 2016-01-08 | 2 | -4/+4 |
|\ \ |
|
| * | | Fix `select_values` method signature for consistency | Ryuta Kamizono | 2016-01-08 | 2 | -4/+4 |
* | | | `{update|delete}_sql` are almost the same as `{update|delete}` | Ryuta Kamizono | 2016-01-08 | 4 | -25/+2 |
|/ / |
|
* | | Ensure `config.active_record.time_zone_aware_types` is always set | Sean Griffin | 2016-01-07 | 1 | -0/+1 |
* | | Remove `delete_sql` in sqlite3 adapter | Ryuta Kamizono | 2016-01-07 | 1 | -5/+0 |
* | | Refactor `connection.insert_sql` | Ryuta Kamizono | 2016-01-07 | 4 | -35/+10 |
* | | Merge pull request #22933 from schneems/schneems/fix-broadcast | Richard Schneeman | 2016-01-06 | 1 | -2/+4 |
|\ \ |
|
| * | | [close #22917] Don't output to `STDOUT` twice | schneems | 2016-01-06 | 1 | -2/+4 |
* | | | fix remove_index for postgresql when running legacy migrations | Lachlan Sylvester | 2016-01-06 | 1 | -2/+3 |
* | | | Merge pull request #22921 from prathamesh-sonpatki/fix-add-reference | Rafael França | 2016-01-06 | 1 | -0/+1 |
|\ \ \ |
|