aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge pull request #22967 from schneems/schneems/generic-metadataSean Griffin2016-01-0813-7/+226
|\ \ | |/ |/|
| * Fixing tests and re-locating error checking.schneems2016-01-083-13/+14
| * Fix kwarg to not have circular dependencyschneems2016-01-081-1/+1
| * Use hash like syntax for InternalMetadataschneems2016-01-086-14/+12
| * Add EnvironmentMismatchErrorschneems2016-01-082-4/+25
| * Use `key` as primary key in schema.schneems2016-01-081-1/+1
| * [ci skip] Add comment to remove silenced code.schneems2016-01-071-0/+1
| * Prevent destructive action on production databaseschneems2016-01-0712-7/+205
* | Merge pull request #22973 from kamipo/fix_select_values_method_signatureRafael França2016-01-082-4/+4
|\ \
| * | Fix `select_values` method signature for consistencyRyuta Kamizono2016-01-082-4/+4
* | | `{update|delete}_sql` are almost the same as `{update|delete}`Ryuta Kamizono2016-01-084-25/+2
|/ /
* | Ensure `config.active_record.time_zone_aware_types` is always setSean Griffin2016-01-071-0/+1
* | Remove `delete_sql` in sqlite3 adapterRyuta Kamizono2016-01-071-5/+0
* | Refactor `connection.insert_sql`Ryuta Kamizono2016-01-074-35/+10
* | Merge pull request #22933 from schneems/schneems/fix-broadcastRichard Schneeman2016-01-061-2/+4
|\ \
| * | [close #22917] Don't output to `STDOUT` twiceschneems2016-01-061-2/+4
* | | fix remove_index for postgresql when running legacy migrationsLachlan Sylvester2016-01-062-2/+19
* | | Merge pull request #22921 from prathamesh-sonpatki/fix-add-referenceRafael França2016-01-061-0/+1
|\ \ \
| * | | Autoload ReferenceDefinition class in abstract adapter so that it can be used...Prathamesh Sonpatki2016-01-051-0/+1
| |/ /
* | | Merge pull request #21688 from kamipo/add_text_and_blob_shorthand_methodsRafael Mendonça França2016-01-063-10/+53
|\ \ \
| * | | Add short-hand methods for text and blob types in MySQLRyuta Kamizono2016-01-053-10/+53
| |/ /
* | | Move CHANGELOG entry to Active RecordRafael Mendonça França2016-01-051-0/+5
* | | Merge pull request #22920 from kamipo/fix_connection_createRafael França2016-01-055-9/+13
|\ \ \ | |/ / |/| |
| * | Fix `connection#create` in PG adapterRyuta Kamizono2016-01-055-9/+13