aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | CI against ruby 2.4.0Akira Matsuda2016-12-251-1/+1
| |
* | "Use assert_nil if expecting nil from ...:in `...'. This will fail in MT6."Akira Matsuda2016-12-256-15/+15
| |
* | Merge pull request #27448 from kamipo/no_need_doc_for_nodoc_classesAkira Matsuda2016-12-255-15/+15
|\ \ | | | | | | No need `:doc:` for `:nodoc:` classes [ci skip]
| * | No need `:doc:` for `:nodoc:` classes [ci skip]Ryuta Kamizono2016-12-255-15/+15
| | | | | | | | | | | | | | | | | | Follow up to 5b14129d8d4ad302b4e11df6bd5c7891b75f393c. http://edgeapi.rubyonrails.org/classes/ActiveRecord/Attribute.html
* | | "Use assert_nil if expecting nil. This will fail in minitest 6."Akira Matsuda2016-12-2569-196/+196
| | |
* | | public methods can be placed after private ones if you want toAkira Matsuda2016-12-251-1/+1
| | | | | | | | | | | | [ci skip]
* | | Abuse of protected in guidesAkira Matsuda2016-12-253-5/+5
| | |
* | | Privatize unneededly protected methods in RailtiesAkira Matsuda2016-12-2525-135/+136
| | |
* | | Privatize some methods that were originally protectedAkira Matsuda2016-12-251-25/+27
| | |
* | | Prefer class << self; def over def self.Akira Matsuda2016-12-251-200/+200
|/ /
* | AR::ConnectionAdapters::PostgreSQL::Name#parts is called from other instancesAkira Matsuda2016-12-251-4/+6
| |
* | `protected` here doesn't protect anythingAkira Matsuda2016-12-251-26/+25
| | | | | | | | there aren't any instance method defined in this class
* | Shuffle travis matrixMatthew Draper2016-12-251-3/+3
| | | | | | | | | | | | * Run actionpack and actioncable tests together * Demote ac:integration to allow_failures -- it works most of the time, but still fails too frequently to rely upon
* | Privatize unneededly protected methods in Active RecordAkira Matsuda2016-12-2426-158/+145
| |
* | No need to nodoc private methodsAkira Matsuda2016-12-2411-31/+31
| |
* | Shave a couple of allocations off Journey scan & parseMatthew Draper2016-12-254-203/+208
| |
* | self. is not needed when calling its own instance methodAkira Matsuda2016-12-241-2/+1
| |
* | Privatize unneededly protected methods in Action ViewAkira Matsuda2016-12-247-39/+32
| |
* | No need to nodoc private methodsAkira Matsuda2016-12-249-20/+20
| |
* | Privatize unneededly protected methods in Action CableAkira Matsuda2016-12-245-25/+24
| |
* | Privatize unneededly protected method in Active JobAkira Matsuda2016-12-241-2/+2
| |
* | No need to nodoc private methodsAkira Matsuda2016-12-241-5/+5
| |
* | Privatize unneededly protected methods in Action MailerAkira Matsuda2016-12-244-27/+20
| |