aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* Allow multiparameter assigned attributes to be used with `text_field`Sean Griffin2017-07-171-1/+1
* Merge pull request #29825 from kamipo/remove_useless_arel_engineSean Griffin2017-07-173-12/+1
|\
| * Remove useless `arel_engine`Ryuta Kamizono2017-07-173-12/+1
* | Post.joins(:users) should not be affected by `User.current_scope`Sean Griffin2017-07-171-4/+2
|/
* Merge pull request #29812 from kamipo/remove_unused_requiresKasper Timm Hansen2017-07-162-5/+0
|\
| * Remove unused requiresRyuta Kamizono2017-07-162-5/+0
* | Merge pull request #29782 from y-yagi/follow_up_29699Kasper Timm Hansen2017-07-162-3/+13
|\ \
| * | Set `represent_boolean_as_integer` via `configuration`yuuji.yaginuma2017-07-162-3/+13
* | | Merge pull request #29813 from kamipo/fix_create_with_multiparameter_attributesKasper Timm Hansen2017-07-161-3/+2
|\ \ \
| * | | Fix `create_with` with multiparameter attributesRyuta Kamizono2017-07-161-3/+2
| | |/ | |/|
* | | Merge pull request #29814 from kamipo/dont_cache_scope_for_createKasper Timm Hansen2017-07-163-4/+4
|\ \ \
| * | | Don't cache `scope_for_create`Ryuta Kamizono2017-07-163-4/+4
| |/ /
* / / Fix code formatting for QueryMethods#selectRobin Dupret2017-07-161-2/+3
|/ /
* | Merge pull request #29809 from kamipo/remove_unused_ivarsKasper Timm Hansen2017-07-161-2/+1
|\ \ | |/ |/|
| * Remove unused `@last`, `@order_clause`, and `@join_dependency`Ryuta Kamizono2017-07-161-2/+1
* | Fix `create_with` using both string and symbolRyuta Kamizono2017-07-166-13/+11
|/
* Merge pull request #29770 from y-yagi/fix_boolean_column_migration_scriptKasper Timm Hansen2017-07-152-2/+2
|\
| * Fix boolean column migration scriptyuuji.yaginuma2017-07-132-2/+2
* | Remove useless `aliased_table_name` in `JoinDependency`Ryuta Kamizono2017-07-154-18/+1
|/
* Merge pull request #29699 from lugray/represent_boolean_as_integerMatthew Draper2017-07-124-4/+62
|\
| * Change sqlite3 boolean serialization to use 1 and 0Lisa Ugray2017-07-114-4/+62
* | [Action Record] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-113-0/+3
|/
* * Don't eagerly require Rails' minitest plugin.Kasper Timm Hansen2017-07-101-1/+1
* Merge pull request #29655 from kirs/frozen-friendly-ap-arMatthew Draper2017-07-101-1/+2
|\
| * Prepare AP and AR to be frozen string friendlyKir Shatrov2017-07-061-1/+2
* | Merge pull request #29715 from reverbdotcom/ptd/fix-invalid-uuidsMatthew Draper2017-07-091-1/+1
|\ \
| * | Don't allow uuids with orphan curly bracespdebelak2017-07-071-1/+1
* | | Merge pull request #28867 from eugeneius/skip_query_cache_in_batchesMatthew Draper2017-07-095-19/+37
|\ \ \
| * | | Skip query cache for in_batches and friendsEugene Kenny2017-07-065-19/+37
* | | | Merge pull request #29692 from fimmtiu/avoid-translating-non-database-exceptionsMatthew Draper2017-07-091-2/+4
|\ \ \ \
| * | | | Don't translate non-database exceptions.Dennis Taylor2017-07-051-2/+4
| |/ / /
* | | | Merge pull request #29495 from eugeneius/_write_attributeMatthew Draper2017-07-096-13/+19
|\ \ \ \
| * | | | Rename raw_write_attribute to write_attribute_without_type_castEugene Kenny2017-07-073-8/+8
| * | | | Improve the performance of writing attributesEugene Kenny2017-06-184-8/+14
* | | | | Merge pull request #29706 from kamipo/use_information_schema_to_extract_expre...Matthew Draper2017-07-091-1/+1
|\ \ \ \ \
| * | | | | Use `information_schema` to extract `generation_expression` for MariaDBRyuta Kamizono2017-07-071-1/+1
| | |_|/ / | |/| | |
* / | | | Fix default `CURRENT_TIMESTAMP` in schema dumping for MariaDB 10.2Ryuta Kamizono2017-07-071-2/+2
|/ / / /
* | / / Fix extracting MariaDB versionRyuta Kamizono2017-07-071-2/+6
| |/ / |/| |
* | | Merge pull request #29413 from kamipo/fix_association_with_scope_including_joinsRafael França2017-07-045-70/+46
|\ \ \
| * | | Fix eager loading association with scope including joinsRyuta Kamizono2017-07-042-11/+21
| * | | Fix preloading association with scope including joinsRyuta Kamizono2017-07-043-49/+25
| * | | Remove unused `association_key` and `table` methods in `Preloader::Association`Ryuta Kamizono2017-07-041-10/+0
| | |/ | |/|
* | | Merge pull request #29667 from kamipo/add_missing_attr_name_to_sRafael França2017-07-041-2/+3
|\ \ \
| * | | Add missing `attr_name.to_s` in `AttributeMutationTracker`Ryuta Kamizono2017-07-041-2/+3
| |/ /
* | | Merge pull request #29653 from kamipo/fix_test_copying_migrations_preserving_...Rafael França2017-07-041-4/+6
|\ \ \
| * | | Fix `test_copying_migrations_preserving_magic_comments`Ryuta Kamizono2017-07-021-4/+6
* | | | Remove database specific JSON typesRyuta Kamizono2017-07-053-14/+0
| |/ / |/| |
* | | Merge branch 'master' into require_relative_2017Xavier Noria2017-07-0225-98/+154
|\ \ \
| * | | Fix removed version 5.2 to 6.0 in the deprecation messageRyuta Kamizono2017-07-021-1/+1
| * | | Apply record state based on parent transaction stateeileencodes2017-07-012-3/+16