aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)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]
| * Update list of `duplicable?` objects in AS core_ext guide [ci skip]utilum2016-12-231-17/+31
| | | | | | | | | | | | | | | | | | | | | | Complex and Rational objects can not be duplicated. Duplicable objects in Ruby 2.4.0 include: - most numbers - symbols - `nil` - `true` - `false`
* | Merge pull request #26977 from y-yagi/fix_26964Kasper Timm Hansen2016-12-292-90/+110
|\ \ | | | | | | use Thor option parser in server commands parse
| * \ 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 loop
| * | | Use `next` instead of `break`; avoid terminating whole loopJon Moss2016-12-292-1/+22
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to avoid terminating the whole loop here, because it will cause parameters that should be removed to not be removed, since we are terminating early. In this specific case, `param2` is processed before `param1` due to the reversing of `route.parts`, and since `param2` fails the check on this line, it would previously cause the whole loop to fail, and `param1` would still be in `parameterized_parts`. Now, we are simply calling `next`, which is the intended behavior. Introduced by 8ca8a2d773b942c4ea76baabe2df502a339d05b1. Fixes #27454.
* | | 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 skip
| * | | Update request.rb --ci skipShardul Parab2016-12-291-0/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation for ActionDispatch::Request#key? [ci skip] Update request.rb --ci skip Documentation for ActionDispatch::Request#key? [ci skip] Also made change after the review by @rafaelfranca . Update request.rb --ci skip Documentation for ActionDispatch::Request#key? [ci skip] Also made change after the review by @rafaelfranca . Update request.rb --ci skip
* | | Merge pull request #27490 from ↵Rafael França2016-12-294-4/+20
|\ \ \ | | | | | | | | | | | | | | | | kamipo/should_not_update_children_when_parent_creation_with_no_reason Should not update children when the parent creation with no reason
| * | | Should not update children when the parent creation with no reasonRyuta Kamizono2016-12-294-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue was introduced with d849f42 to solve #19782. However, we can solve #19782 without causing the issue. It is enough to save only when necessary. Fixes #27338.
* | | | 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 `AssociationQueryValue`
| * | | Remove extracting `polymorphic_base_class` for `Array` in ↵Ryuta Kamizono2016-09-211-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | `AssociationQueryValue` It is handled by `PolymorphicArrayValue`.
* | | | Merge pull request #26443 from y-yagi/clear_all_environments_log_by_defaultRafael Mendonça França2016-12-293-2/+43
|\ \ \ \ | | | | | | | | | | | | | | | clear all environments log files by default
| * \ \ \ Merge branch 'master' into clear_all_environments_log_by_defaultRafael França2016-12-29924-7251/+18070
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Revert "Revert "Merge pull request #17943 from ↵Rafael Mendonça França2016-12-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jeremywadsack/doc_cache_importability"" This reverts commit 6961afefd2f163f30b9ae3aacb74b290287f9a80. We were not able to keep backward compatibility in this case so it is better to ask people to upgrade with cold cache.
* | | | | Merge pull request #27488 from tarcieri/upgrade-nio4r-to-2-0Rafael França2016-12-282-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Upgrade to nio4r 2.0.0
| * | | | | Upgrade to nio4r 2.0.0Tony Arcieri2016-12-282-3/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nio4r 2.0.0 primarily includes new features and bugfixes, with few breaking changes. The primary reason for bumping the major version is dropping support for all Ruby versions prior to 2.2.2, so as to match Rails 5. Full release announcement here: https://groups.google.com/forum/#!topic/socketry/ZDIUj1ufiJ8
* | | | | Merge pull request #27402 from yui-knk/executeRafael França2016-12-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Use `#execute` instead of `@connection.query`
| * | | | | Use `#execute` instead of `@connection.query`yui-knk2016-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `@connection.query` bypasses instrumenting "sql.active_record". This behavior preventing us from debugging SQLs which Rails generates.
* | | | | | 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`
| * | | | | | do not mutate `object_name` of class in `fields_for`yuuji.yaginuma2016-12-273-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since it affects the entire form, should not mutate `object_name` of class. Fixes #26931
* | | | | | | Fix Rubocop violations and fix documentation visibilityRafael Mendonça França2016-12-2833-232/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some methods were added to public API in 5b14129d8d4ad302b4e11df6bd5c7891b75f393c and they should be not part of the public API.
* | | | | | | Merge pull request #27486 from schleyfox/optimize-journey-route-score-url_forRafael França2016-12-283-6/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Optimize Journey::Route#score for url_for
| * | | | | | | Optimize Journey::Route#scoreBen Hughes2016-12-283-6/+15
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scoring routes based on constraints repeated many type conversions that could be performed in the outer loop. Determinations of score and fitness also used Array operations that required allocations. Against my benchmark with a large routeset, this reduced object allocations by over 30x and wall time by over 3x.
* | | | | | | 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]
| * | | | | | | 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 record
| * | | | | | | Add a record to target before any callbacks loads the recordRyuta Kamizono2016-12-233-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `append_record` was added at 15ddd51 for not double adding the record. But adding `append_record` (checking `@target.include?(record)`) caused performance regression #27434. Instead of checking not double adding the record, add a record to target before any callbacks loads the record. Fixes #27434.
* | | | | | | | Merge pull request #27472 from maclover7/jm-fixup-changelogsJon Moss2016-12-273-6/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Small edits to CHANGELOG.md files
| * | | | | | | | Small edits to activerecord/CHANGELOG.mdJon Moss2016-12-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] - add period where necessary - add backticks where necessary
| * | | | | | | | Small edits to actionpack/CHANGELOG.mdJon Moss2016-12-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] - change a period to a comma - add backticks for class + method
| * | | | | | | | Small edits to actioncable/CHANGELOG.mdJon Moss2016-12-271-2/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] - capitalize WebSocket
* | | | | | | | Merge pull request #27471 from maclover7/jm-rm-spacesJon Moss2016-12-272-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Light CHANGELOG.md linting
| * | | | | | | | Add backticks to show shell commandJon Moss2016-12-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Remove random extra spaces from Action Pack and Railties CHANGELOG.mdJon Moss2016-12-272-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | 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]
| * | | | | | | 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 entries
| * | | | | | | Restore missing Gemfile.lock entriesRyuta Kamizono2016-12-271-0/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | These lines were lost in https://github.com/rails/rails/commit/774be3ea3b9d25ab69daf11c5071deaf053d7d5b#diff-e79a60dc6b85309ae70a6ea8261eaf95L204.
* | | | | | | 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#98
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #27447 [Matthew Draper & Yuuji Yaginuma]
* | | | | | | "Use assert_nil if expecting nil from ...:in `...'. This will fail in ↵Akira Matsuda2016-12-253-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | minitest 6."
* | | | | | | Expectation firstAkira Matsuda2016-12-252-5/+5
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 05:47:45 +0000