aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #30271 from kamipo/through_scope_should_not_be_affected_by...Rafael França2017-08-155-19/+33
|\
| * Through scope should not be affected by scopingRyuta Kamizono2017-08-155-19/+33
* | Don't expose `write_attribute_without_type_cast`Ryuta Kamizono2017-08-161-6/+5
|/
* Formatting CHANGELOGs [ci skip]Ryuta Kamizono2017-08-151-2/+2
* Merge pull request #30169 from awortham/awortham/awortham/fix-sql-distinct-bugRafael Mendonça França2017-08-143-0/+35
|\
| * Ensure sum honors distinct on has_many throughAaron Wortham2017-08-143-0/+35
* | Merge pull request #30215 from untidy-hair/clarify-abstract-or-not-in-testsRafael França2017-08-143-8/+18
|\ \
| * | Clarify base_class tests on abstract STI vs concrete STIYukio Mizuta2017-08-123-8/+18
* | | Merge pull request #30073 from yalab/fixture_binary_helperRafael França2017-08-144-1/+14
|\ \ \
| * | | Add `binary` helper method to fixtures.yalab2017-08-124-1/+14
* | | | Merge pull request #30208 from kamipo/extract_primary_key_to_abstract_reflectionRafael França2017-08-141-8/+4
|\ \ \ \
| * | | | Extract `primary_key` to `AbstractReflection`Ryuta Kamizono2017-08-121-8/+4
| | |/ / | |/| |
* | | | Merge pull request #27609 from kamipo/fix_association_primary_keyRafael França2017-08-144-21/+25
|\ \ \ \
| * | | | Fix `reflection.association_primary_key` for `has_many` associationsRyuta Kamizono2017-08-134-21/+25
* | | | | Merge pull request #30229 from kamipo/allow_serialize_with_custom_coderRafael França2017-08-143-9/+54
|\ \ \ \ \
| * | | | | Allow `serialize` with a custom coder on `json` and `array` columnsRyuta Kamizono2017-08-133-9/+54
* | | | | | Merge pull request #30214 from kirs/uniqueness-scope-validatorRafael França2017-08-142-0/+11
|\ \ \ \ \ \
| * | | | | | Check :scope input in Uniqueness validatorKir Shatrov2017-08-132-0/+11
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #30236 from padi/find-each-example-updateRafael França2017-08-141-1/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Completes ActiveRecord::Batches.find_each example [ci skip]Marc Rendl Ignacio2017-08-131-1/+6
| | |_|/ / | |/| | |
* | | | | Merge pull request #30231 from kamipo/remove_unused_source_type_infoRafael França2017-08-141-10/+7
|\ \ \ \ \
| * | | | | Remove unused `source_type_info` in `RuntimeReflection`Ryuta Kamizono2017-08-131-10/+7
| | |_|/ / | |/| | |
* | | | | Merge pull request #30233 from kamipo/remove_duplicated_join_id_forRafael França2017-08-141-10/+2
|\ \ \ \ \
| * | | | | Remove duplicated `join_id_for`Ryuta Kamizono2017-08-131-10/+2
| |/ / / /
* | | | | Merge pull request #30206 from yukihirop/improve_activerecord_rdocKasper Timm Hansen2017-08-141-0/+4
|\ \ \ \ \
| * | | | | Add document that you rake test single file by using DB(ex. postgresql) [ci s...yukihirop2017-08-121-0/+4
* | | | | | Fix CI failure due to reference type mismatchRyuta Kamizono2017-08-142-12/+18
| |/ / / / |/| | | |
* | | | | Merge pull request #30228 from kamipo/fix_random_ci_failureMatthew Draper2017-08-131-2/+4
|\ \ \ \ \
| * | | | | Fix random CI failure due to non-deterministic sorting orderRyuta Kamizono2017-08-131-2/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #30079 from kamipo/move_test_not_compatible_with_serialize...Matthew Draper2017-08-132-11/+11
|\ \ \ \ \
| * | | | | Move `test_not_compatible_with_serialize_macro` to `JSONSharedTestCases`Ryuta Kamizono2017-08-112-11/+11
* | | | | | Delegate to `Enumerable#find` for `CollectionProxy`Ryuta Kamizono2017-08-132-17/+14
| |/ / / / |/| | | |
* | | | | Remove duplicated `table_name`Ryuta Kamizono2017-08-121-8/+0
| |_|/ / |/| | |
* | | | Fix outdated comment for `Core::ClassMethods#===` [ci skip] (#30146)Ryuta Kamizono2017-08-121-2/+2
| |/ / |/| |
* | | Merge pull request #30126 from chopraanmol1/support_for_has_many_and_has_one_...Rafael França2017-08-114-12/+26
|\ \ \
| * | | Changed join_fk private method to join_foreign_key public methodchopraanmol12017-08-093-15/+11
| * | | Currently if relation object are passed to where condition for has one or has...chopraanmol12017-08-083-3/+21
* | | | Merge pull request #30103 from yahonda/has_one_associations_failuresRafael França2017-08-111-1/+1
|\ \ \ \
| * | | | Add `:authors` fixture to address two random failures at HasOneAssociationsTestYasuo Honda2017-08-061-1/+1
* | | | | Merge pull request #30159 from allcentury/dump-temp-file-permissionsRafael França2017-08-111-1/+1
|\ \ \ \ \
| * | | | | Use copy to preserve file permissionsAnthony Ross2017-08-091-1/+1
* | | | | | Merge pull request #29720 from gaurish/ar_find_error_message_improvementRafael França2017-08-114-7/+11
|\ \ \ \ \ \
| * | | | | | Return Not found Ids in ActiveRecord::NotFoundGaurish Sharma2017-07-294-7/+11
* | | | | | | Merge pull request #30193 from zverok/robust-postgres-duplicate-dbRafael França2017-08-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Update database duplication checkzverok2017-08-111-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Specify `table.name` only when `scope.table` and `table` are different (#29058)Ryuta Kamizono2017-08-112-4/+13
* | | | | | | Fix RDoc formatting: `+` doesn't work with `@`ohbarye2017-08-112-6/+6
|/ / / / / /
* | | | | | Merge pull request #30183 from kamipo/reaper_run_after_conn_pool_initializedMatthew Draper2017-08-111-2/+3
|\ \ \ \ \ \
| * | | | | | Start `@reaper.run` after connection pool initializedRyuta Kamizono2017-08-111-2/+3
* | | | | | | Merge pull request #30152 from bogdanvlviv/fix_random_ci_failureMatthew Draper2017-08-101-1/+1
|\ \ \ \ \ \ \