aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #26986 from bogdanvlviv/docs_migrationsEileen M. Uchitelle2016-11-061-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add missing spaces [ci skip]bogdanvlviv2016-11-071-2/+2
|/ / / / /
* | | | | Merge pull request #26909 from matthewd/query-cache-connectionMatthew Draper2016-11-064-40/+75
|\ \ \ \ \
| * | | | | Clear query cache during checkin, instead of an execution callbackMatthew Draper2016-10-274-40/+75
* | | | | | Merge pull request #26972 from kamipo/avoid_unscope_order_when_limit_value_pr...Rafael França2016-11-052-8/+17
|\ \ \ \ \ \
| * | | | | | Avoid `unscope(:order)` when `limit_value` is presented for `count`Ryuta Kamizono2016-11-062-8/+17
* | | | | | | Erubis is not actually used in ARAkira Matsuda2016-11-061-2/+2
|/ / / / / /
* | | | | | Merge pull request #26969 from y-yagi/remove_unused_requiresRafael França2016-11-051-3/+0
|\ \ \ \ \ \
| * | | | | | remove unused requireyuuji.yaginuma2016-11-051-3/+0
* | | | | | | Merge pull request #26971 from damireh/patch-1Jon Moss2016-11-051-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use local variable instead of instance variable [ci skip]Daniel Amireh2016-11-051-1/+1
|/ / / / / / /
* | | | | | | Tweaking some test data due to sprintf behavior change in 2.4Akira Matsuda2016-11-051-5/+5
* | | | | | | Show what was the error when assertion has failedAkira Matsuda2016-11-051-1/+1
* | | | | | | Less method invocationAkira Matsuda2016-11-051-1/+1
* | | | | | | Merge pull request #26967 from headius/bad_threading_testAaron Patterson2016-11-041-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Use different name for main and thread connection variable.Charles Oliver Nutter2016-11-041-5/+5
| |/ / / / / /
* | | | | | | Merge pull request #26965 from rothhound/update_sqlite3Guillermo Iguaran2016-11-041-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Update sqlite3Gianfranco Montoya2016-11-041-3/+3
|/ / / / / / /
* | | | | | | Merge pull request #26536 from y-yagi/change_increment_and_decrement_to_publi...Arthur Nogueira Neves2016-11-041-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | change `MemCacheStore#increment` and `MemCacheStore#decrement` to public API ...yuuji.yaginuma2016-09-181-2/+2
* | | | | | | Don't assign default attributes until after loading schemaSean Griffin2016-11-031-1/+1
* | | | | | | Merge pull request #26455 from kamipo/move_test_quoting_classesArthur Nogueira Neves2016-11-032-13/+4
|\ \ \ \ \ \ \
| * | | | | | | Move `test_quoting_classes` into `test/cases/quoting_test.rb`Ryuta Kamizono2016-10-292-13/+4
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #24202 from Sen-Zhang/fix_datetime_errorArthur Nogueira Neves2016-11-033-1/+13
|\ \ \ \ \ \ \
| * | | | | | | fix datatime errorSen-Zhang2016-11-013-1/+13
* | | | | | | | Fixes TypeError Exception when cache counter value equals nil (#26940)Daniel E. Garcia Shulman2016-11-022-1/+6
* | | | | | | | Use tr instead of gsubAkira Matsuda2016-11-021-1/+1
* | | | | | | | Merge pull request #26951 from y-yagi/fix_ruby_warningGuillermo Iguaran2016-11-011-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | remove warning from railtieyuuji.yaginuma2016-11-021-1/+1
|/ / / / / / /
* | | | | | | Make `register_block_for` privateArthur Neves2016-11-011-11/+11
* | | | | | | Merge pull request #26950 from bouk/exclude-dbmigrateSean Griffin2016-11-013-0/+10
|\ \ \ \ \ \ \
| * | | | | | | Don't put db:migrate and db:setup in binfiles if activerecord is excludedBouke van der Bijl2016-11-013-0/+10
* | | | | | | | Merge pull request #26451 from kamipo/remove_target_uniq_sizeSean Griffin2016-11-011-5/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unnecessary `target.uniq.size` in `CollectionAssociation#size`Ryuta Kamizono2016-10-291-5/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #26453 from kamipo/remove_unused_internal_dependent_optionSean Griffin2016-11-011-4/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Remove unused internal `:dependent` option in `CollectionAssociation#delete`Ryuta Kamizono2016-10-291-4/+1
| |/ / / / / /
* | | | | | | Allow `autosave: true` to be used with inverse ofSean Griffin2016-11-015-12/+14
* | | | | | | Merge pull request #25337 from sgrif/sg-changes-in-callbacksSean Griffin2016-11-0118-53/+362
|\ \ \ \ \ \ \
| * | | | | | | Deprecate the behavior of AR::Dirty inside of after_(create|update|save) call...Sean Griffin2016-11-0118-53/+362
* | | | | | | | Merge PR #26052Arthur Neves2016-11-011-12/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Added register_block method to register rake_tasks, generators, console & run...Rafael Fidelis2016-11-011-12/+16
* | | | | | | | Merge pull request #26943 from colleenmcguckin/testing_typoKasper Timm Hansen2016-10-311-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | fix typo in Rails Test Runner sectioncolleenmcguckin2016-10-311-2/+2
|/ / / / / / / /
* | | | | | | | Ensure duration parsing is consistent across DST changesAndrew White2016-10-313-2/+54
* | | | | | | | Merge pull request #26838 from Cohen-Carlisle/activerecord-slice-array-argsGuillermo Iguaran2016-10-313-1/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | allow ActiveRecord::Core#slice to use array argCohen Carlisle2016-10-313-1/+15
|/ / / / / / / /
* | | | | | | | Merge pull request #23094 from yui-knk/fix_ar_test_commentArthur Nogueira Neves2016-10-311-5/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove a confusing commentyui-knk2016-10-311-1/+0
| * | | | | | | | Fix the order of `create_table` to match a comment about `:inverse_of` optionsyui-knk2016-10-311-4/+4
* | | | | | | | | Merge pull request #26938 from riseshia/patch-1प्रथमेश Sonpatki2016-10-311-1/+0
|\ \ \ \ \ \ \ \ \