aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Use existing class in PersistenceTest::SaveTestAlex Kitchens2017-06-011-21/+7
* Merge pull request #29287 from alexcameron89/fix-db-statement-test-48104Matthew Draper2017-06-011-0/+1
|\
| * Reset primary key sequence in FixturesResetPkSequenceTestsAlex Kitchens2017-05-311-0/+1
* | Ensure fixtures are loaded for FoxyFixturesTestAlex Kitchens2017-05-311-0/+2
* | Make sure to disable extension after testyuuji.yaginuma2017-05-311-6/+2
|/
* Merge branch 'master' into unlock-minitestKasper Timm Hansen2017-05-29129-908/+957
|\
| * Merge pull request #29248 from yawboakye/rename-should-rename-table-pkeyGuillermo Iguaran2017-05-292-4/+28
| |\
| | * `rename_table` renames primary key index nameYaw Boakye2017-05-292-4/+28
| * | Add option for class_attribute default (#29270)David Heinemeier Hansson2017-05-2916-72/+31
| * | Remove a redundant test assertionKoichi ITO2017-05-291-6/+0
| |/
| * Merge pull request #29208 from kamipo/default_env_fall_back_to_default_env_wh...Guillermo Iguaran2017-05-282-1/+12
| |\
| | * `DEFAULT_ENV` falls back to `default_env` when `RAILS_ENV` or `RACK_ENV` is a...Ryuta Kamizono2017-05-252-1/+12
| * | Deprecate passing arguments and block at the same time to `count` and `sum` i...Ryuta Kamizono2017-05-293-2/+36
| * | Merge pull request #29258 from koic/remove_redundant_command_recorder_testMatthew Draper2017-05-291-5/+0
| |\ \
| | * | Remove a redundant test case of command_recorder_testKoichi ITO2017-05-291-5/+0
| * | | Merge pull request #29074 from kamipo/remove_returning_true_in_internal_callb...Kasper Timm Hansen2017-05-282-9/+1
| |\ \ \
| | * | | Remove returning true in internal callbacksRyuta Kamizono2017-05-142-9/+1
| * | | | Merge pull request #29253 from kamipo/prevent_extra_queryMatthew Draper2017-05-292-6/+12
| |\ \ \ \
| | * | | | Prevent extra `current_database` query for `encoding`/`collation`/`ctype`Ryuta Kamizono2017-05-282-6/+12
| * | | | | Merge pull request #28969 from kamipo/refactor_enum_to_use_value_instead_of_l...Matthew Draper2017-05-284-14/+16
| |\ \ \ \ \
| | * | | | | Refactor enum to use `value` instead of `label` in the scopeRyuta Kamizono2017-05-074-14/+16
| * | | | | | Merge pull request #29003 from kamipo/delegate_ast_and_locked_to_arel_explicitlyMatthew Draper2017-05-284-1/+13
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Delegate `ast` and `locked` to `arel` explicitlyRyuta Kamizono2017-05-064-1/+13
| * | | | | | Merge pull request #29197 from kamipo/enable_extending_even_if_scope_returns_nilMatthew Draper2017-05-282-7/+7
| |\ \ \ \ \ \
| | * | | | | | Enable extending even if scope returns nilRyuta Kamizono2017-05-242-7/+7
| * | | | | | | Merge pull request #29250 from kamipo/remove_unused_association_interpolateMatthew Draper2017-05-281-8/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Remove unused `Association#interpolate`Ryuta Kamizono2017-05-281-8/+0
| | | |_|_|_|/ / | | |/| | | | |
| * / | | | | | Fix regression in Numericality validator where extra decimal places on Bradley Priest2017-05-271-0/+14
| |/ / / / / /
| * | | | | | Merge pull request #29240 from tjschuck/ar_batches_doc_updatesRafael França2017-05-261-12/+12
| |\ \ \ \ \ \
| | * | | | | | Doc updates for ActiveRecord::BatchesT.J. Schuck2017-05-261-12/+12
| * | | | | | | Merge pull request #29237 from mohitnatoo/arel-update-docRafael França2017-05-261-3/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | [ci skip] Changed sentence formation for ActiveRecordRelation#updateMohit Natoo2017-05-261-3/+3
| * | | | | | | Merge pull request #29239 from koic/remove_redundant_test_assertionMatthew Draper2017-05-271-1/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Remove a redundant test assertionKoichi ITO2017-05-271-1/+0
| * | | | | | | | Avoid circular require due to autoloadMatthew Draper2017-05-261-9/+9
| |/ / / / / / /
| * | | | | | | Merge pull request #29176 from bogdanvlviv/define-path-with__dir__Matthew Draper2017-05-2610-13/+13
| |\ \ \ \ \ \ \
| | * | | | | | | Define path with __dir__bogdanvlviv2017-05-2310-13/+13
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #29221 from koic/remove_duplicate_migration_testMatthew Draper2017-05-261-27/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Remove a duplicate test of migration_test in ARKoichi ITO2017-05-251-27/+0
| * | | | | | | | Merge pull request #29230 from koic/remove_duplicate_schema_authorization_testMatthew Draper2017-05-261-11/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove a duplicate test of schema_authorization_test in ARKoichi ITO2017-05-251-11/+0
| * | | | | | | | | Merge pull request #29215 from voxmedia/ar_optimizationsMatthew Draper2017-05-263-3/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Make #deep_dup use #allocate instead of #newMichael Lovitt2017-05-251-1/+3
| | * | | | | | | | | Performance optimization for ActiveRecord#column_defaultsMichael Lovitt2017-05-241-1/+2
| | * | | | | | | | | Performance optimization for ActiveRecord#subclass_from_attributesMichael Lovitt2017-05-241-1/+1
| | * | | | | | | | | Performance optimization for AttributeSet#deep_dupMichael Lovitt2017-05-241-3/+1
| * | | | | | | | | | Merge pull request #29226 from koic/remove_duplicate_mysql_rake_testMatthew Draper2017-05-261-7/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Remove a duplicate test of mysql_rake_testKoichi ITO2017-05-261-7/+0
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #29216 from matthewd/threadsafe-load-schemaMatthew Draper2017-05-263-3/+56
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Add a Monitor to ModelSchema#load_schemaMatthew Draper2017-05-253-3/+56
| | |/ / / / / / / /