aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #20005 from kamipo/default_expression_supportRafael França2016-01-1611-44/+100
|\
| * Fix extract default with CURRENT_TIMESTUMPRyuta Kamizono2016-01-133-2/+24
| * Fix extract default with CURRENT_DATERyuta Kamizono2016-01-131-3/+8
| * Add expression support on the schema defaultRyuta Kamizono2016-01-138-39/+68
* | Merge pull request #23067 from kamipo/sql_for_insert_returns_values_for_passi...Rafael França2016-01-163-24/+16
|\ \
| * | `sql_for_insert` returns values for passing to `exec_insert`Ryuta Kamizono2016-01-153-24/+16
* | | Merge pull request #23060 from schneems/schneems/revert-revert-migration-set-...Richard Schneeman2016-01-152-19/+59
|\ \ \
| * | | Fix intermittent test failuresschneems2016-01-141-0/+1
| * | | Revert "Revert "Set environment even when no migration runs""schneems2016-01-142-19/+58
| |/ /
* | | Merge pull request #23065 from kamipo/clean_up_internal_metadata_definitionRichard Schneeman2016-01-152-4/+3
|\ \ \
| * | | Clean up internal metadata definitionRyuta Kamizono2016-01-152-4/+3
* | | | `last_insert_id_value` and `last_insert_id` are unused anymoreRyuta Kamizono2016-01-151-9/+1
| |/ / |/| |
* | | Revert "Set environment even when no migration runs"Sean Griffin2016-01-142-58/+19
* | | Revert "Merge pull request #20835 from glittershark/if-and-unless-in-secure-t...Kasper Timm Hansen2016-01-145-45/+2
* | | Merge pull request #23048 from kamipo/substitute_at_is_no_longer_usedSean Griffin2016-01-146-20/+3
|\ \ \
| * | | `substitute_at` is no longer usedRyuta Kamizono2016-01-146-20/+3
| | |/ | |/|
* | | Properly include the `from` clause when merging relationsSean Griffin2016-01-142-0/+10
* | | Ensure enum scopes work properly with STI and inheritanceSean Griffin2016-01-141-1/+1
* | | Merge pull request #23017 from schneems/schneems/migration-sets-environment-v...Richard Schneeman2016-01-142-19/+58
|\ \ \
| * | | Set environment even when no migration runsschneems2016-01-112-1/+37
| * | | Clean up duplicate migration logicschneems2016-01-112-18/+21
| | |/ | |/|
* | | update doc for << method of has_many associationankit19102016-01-141-0/+1
| |/ |/|
* | docs, formatting pass over changelogs. [ci skip]Yves Senn2016-01-131-3/+3
* | fix regression when loading fixture files with symbol keys.Yves Senn2016-01-134-2/+16
* | Improve error message for #or when it is structurally incompatibleRafael Mendonça França2016-01-132-7/+11
* | Revert "Change `WhereClause#merge` to same named columns on diff tables"Sean Griffin2016-01-122-25/+13
* | Change `WhereClause#merge` to same named columns on diff tablesSean Griffin2016-01-122-13/+25
* | add migration versioning example to the changelog. [ci skip]Yves Senn2016-01-121-0/+8
* | Merge pull request #23004 from matthewd/default-scope-stiMatthew Draper2016-01-127-19/+61
|\ \
| * | Skip the STI condition when evaluating a default scopeMatthew Draper2016-01-124-3/+24
| * | Active scopes apply to child classes, though not parents/siblingsMatthew Draper2016-01-123-16/+37
| |/
* / Allow manually setting environment valueschneems2016-01-112-6/+17
|/
* Extract `MySQL::TypeMetadata` class to `connection_adapters/mysql/type_metada...Ryuta Kamizono2016-01-113-29/+35
* Extract `MySQL::Column` class to `connection_adapters/mysql/column.rb`Ryuta Kamizono2016-01-113-56/+62
* Merge pull request #22992 from akshay-vishnoi/fix-docsSean Griffin2016-01-091-1/+1
|\
| * [ci skip] fix typoAkshay Vishnoi2016-01-101-1/+1
* | Split out token `if` tests to trigger `before_create`.Kasper Timm Hansen2016-01-091-1/+5
* | Revert "Switch `has_secure_token` to `before_save`."Kasper Timm Hansen2016-01-091-4/+3
* | Switch `has_secure_token` to `before_save`.Kasper Timm Hansen2016-01-091-3/+4
* | Add conditional_token to users.Kasper Timm Hansen2016-01-091-0/+1
* | Support :if and :unless in has_secure_tokenGriffin Smith2016-01-094-2/+40
|/
* Merge pull request #22988 from y-yagi/match_environment_variable_name_and_err...Richard Schneeman2016-01-091-1/+1
|\
| * match the environment variable name that actually checking and error messageyuuji.yaginuma2016-01-091-1/+1
* | Merge pull request #22986 from yui-knk/fix_automatic_inverse_of_commentप्रथमेश Sonpatki2016-01-091-1/+1
|\ \ | |/ |/|
| * [ci skip] `automatic_inverse_of` returns `false` not `nil` (document fix)yui-knk2016-01-091-1/+1
* | Added missing CHANGELOG entry for https://github.com/rails/rails/pull/22976Prathamesh Sonpatki2016-01-091-0/+8
|/
* Merge pull request #22976 from schneems/schneems/schema-migration-primary-keySean Griffin2016-01-082-3/+3
|\
| * Get update_attributes working with SchemaMigrationschneems2016-01-082-3/+3
* | Fix the broken buildSean Griffin2016-01-081-0/+2
* | Refactor tz aware types, add support for PG rangesSean Griffin2016-01-084-8/+63