aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ci skip] Rejigger the dublicable? wording a bit.Kasper Timm Hansen2016-12-291-9/+12
* Merge pull request #27346 from utilum/core_ext_guide_duplicableKasper Timm Hansen2016-12-291-17/+31
|\
| * Update list of `duplicable?` objects in AS core_ext guide [ci skip]utilum2016-12-231-17/+31
* | Merge pull request #26977 from y-yagi/fix_26964Kasper Timm Hansen2016-12-292-90/+110
|\ \
| * \ Merge branch 'master' into fix_26964Kasper Timm Hansen2016-12-29458-2495/+4095
| |\ \ | |/ / |/| |
* | | Merge pull request #27499 from maclover7/jm-fix-27454Rafael França2016-12-292-1/+22
|\ \ \
| * | | Use `next` instead of `break`; avoid terminating whole loopJon Moss2016-12-292-1/+22
|/ / /
* | | Use proper output format [ci skip] (#27498)प्रथमेश Sonpatki2016-12-292-2/+2
* | | Merge pull request #27482 from shardulparab97/patch-8प्रथमेश Sonpatki2016-12-291-0/+3
|\ \ \
| * | | Update request.rb --ci skipShardul Parab2016-12-291-0/+3
|/ / /
* | | Merge pull request #27490 from kamipo/should_not_update_children_when_parent_...Rafael França2016-12-294-4/+20
|\ \ \
| * | | Should not update children when the parent creation with no reasonRyuta Kamizono2016-12-294-4/+20
* | | | Merge pull request #26376 from kamipo/remove_polymorphic_base_class_for_arrayRafael França2016-12-291-3/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove extracting `polymorphic_base_class` for `Array` in `AssociationQueryVa...Ryuta Kamizono2016-09-211-3/+0
* | | | Merge pull request #26443 from y-yagi/clear_all_environments_log_by_defaultRafael Mendonça França2016-12-293-2/+43
|\ \ \ \
| * \ \ \ Merge branch 'master' into clear_all_environments_log_by_defaultRafael França2016-12-29924-7251/+18070
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Revert "Revert "Merge pull request #17943 from jeremywadsack/doc_cache_import...Rafael Mendonça França2016-12-291-0/+4
* | | | | Merge pull request #27488 from tarcieri/upgrade-nio4r-to-2-0Rafael França2016-12-282-3/+3
|\ \ \ \ \
| * | | | | Upgrade to nio4r 2.0.0Tony Arcieri2016-12-282-3/+3
|/ / / / /
* | | | | Merge pull request #27402 from yui-knk/executeRafael França2016-12-281-1/+1
|\ \ \ \ \
| * | | | | Use `#execute` instead of `@connection.query`yui-knk2016-12-191-1/+1
* | | | | | Merge pull request #27463 from y-yagi/fix_26931Rafael França2016-12-283-2/+11
|\ \ \ \ \ \
| * | | | | | do not mutate `object_name` of class in `fields_for`yuuji.yaginuma2016-12-273-2/+11
* | | | | | | Fix Rubocop violations and fix documentation visibilityRafael Mendonça França2016-12-2833-232/+231
* | | | | | | Merge pull request #27486 from schleyfox/optimize-journey-route-score-url_forRafael França2016-12-283-6/+15
|\ \ \ \ \ \ \
| * | | | | | | Optimize Journey::Route#scoreBen Hughes2016-12-283-6/+15
|/ / / / / / /
* | | | | | | Merge pull request #27479 from kenta-s/fix-typo-in-action_view-templateप्रथमेश Sonpatki2016-12-281-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix typo in action_view/template.rb [ci skip]kenta-s2016-12-281-1/+1
|/ / / / / / /
* | | | | | | Upgrade gemsRafael Mendonça França2016-12-281-3/+1
* | | | | | | Merge pull request #27442 from kamipo/fix_27434Eileen M. Uchitelle2016-12-273-14/+17
|\ \ \ \ \ \ \
| * | | | | | | Add a record to target before any callbacks loads the recordRyuta Kamizono2016-12-233-14/+17
* | | | | | | | Merge pull request #27472 from maclover7/jm-fixup-changelogsJon Moss2016-12-273-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Small edits to activerecord/CHANGELOG.mdJon Moss2016-12-271-2/+2
| * | | | | | | | Small edits to actionpack/CHANGELOG.mdJon Moss2016-12-271-2/+2
| * | | | | | | | Small edits to actioncable/CHANGELOG.mdJon Moss2016-12-271-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #27471 from maclover7/jm-rm-spacesJon Moss2016-12-272-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Add backticks to show shell commandJon Moss2016-12-271-2/+2
| * | | | | | | | Remove random extra spaces from Action Pack and Railties CHANGELOG.mdJon Moss2016-12-272-3/+3
* | | | | | | | | bundle updateMatthew Draper2016-12-271-6/+6
|/ / / / / / / /
* | | | | | | | Merge pull request #27469 from ota42y/ota42y/renderers_typo_fixप्रथमेश Sonpatki2016-12-271-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | renderers typo fix [ci skip]ota42y2016-12-271-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #27459 from kamipo/restore_gemfile_lock_entriesMatthew Draper2016-12-271-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Restore missing Gemfile.lock entriesRyuta Kamizono2016-12-271-0/+2
|/ / / / / / /
* | | | | | | bundle updateMatthew Draper2016-12-262-43/+30
* | | | | | | assert_equal takes expectation firstAkira Matsuda2016-12-2618-73/+73
* | | | | | | Merge pull request #27451 from rails/sdoc-rc1Akira Matsuda2016-12-252-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Bump sdoc to rc1 which includes zzak/sdoc#98Zachary Scott2016-12-252-5/+5
|/ / / / / / /
* | | | | | | Correct indent-accounting in controller route generationMatthew Draper2016-12-252-12/+15
* | | | | | | "Use assert_nil if expecting nil from ...:in `...'. This will fail in minites...Akira Matsuda2016-12-253-5/+4
* | | | | | | Expectation firstAkira Matsuda2016-12-252-5/+5