Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #27488 from tarcieri/upgrade-nio4r-to-2-0 | Rafael França | 2016-12-28 | 2 | -3/+3 |
|\ | | | | | Upgrade to nio4r 2.0.0 | ||||
| * | Upgrade to nio4r 2.0.0 | Tony Arcieri | 2016-12-28 | 2 | -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/execute | Rafael França | 2016-12-28 | 1 | -1/+1 |
|\ | | | | | Use `#execute` instead of `@connection.query` | ||||
| * | Use `#execute` instead of `@connection.query` | yui-knk | 2016-12-19 | 1 | -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_26931 | Rafael França | 2016-12-28 | 3 | -2/+11 |
|\ \ | | | | | | | do not mutate `object_name` of class in `fields_for` | ||||
| * | | do not mutate `object_name` of class in `fields_for` | yuuji.yaginuma | 2016-12-27 | 3 | -2/+11 |
| | | | | | | | | | | | | | | | | | | Since it affects the entire form, should not mutate `object_name` of class. Fixes #26931 | ||||
* | | | Fix Rubocop violations and fix documentation visibility | Rafael Mendonça França | 2016-12-28 | 33 | -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_for | Rafael França | 2016-12-28 | 3 | -6/+15 |
|\ \ \ | | | | | | | | | Optimize Journey::Route#score for url_for | ||||
| * | | | Optimize Journey::Route#score | Ben Hughes | 2016-12-28 | 3 | -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 | प्रथमेश Sonpatki | 2016-12-28 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix typo in action_view/template.rb [ci skip] | ||||
| * | | | Fix typo in action_view/template.rb [ci skip] | kenta-s | 2016-12-28 | 1 | -1/+1 |
|/ / / | |||||
* | | | Upgrade gems | Rafael Mendonça França | 2016-12-28 | 1 | -3/+1 |
| | | | |||||
* | | | Merge pull request #27442 from kamipo/fix_27434 | Eileen M. Uchitelle | 2016-12-27 | 3 | -14/+17 |
|\ \ \ | | | | | | | | | Add a record to target before any callbacks loads the record | ||||
| * | | | Add a record to target before any callbacks loads the record | Ryuta Kamizono | 2016-12-23 | 3 | -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-changelogs | Jon Moss | 2016-12-27 | 3 | -6/+6 |
|\ \ \ \ | | | | | | | | | | | Small edits to CHANGELOG.md files | ||||
| * | | | | Small edits to activerecord/CHANGELOG.md | Jon Moss | 2016-12-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] - add period where necessary - add backticks where necessary | ||||
| * | | | | Small edits to actionpack/CHANGELOG.md | Jon Moss | 2016-12-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] - change a period to a comma - add backticks for class + method | ||||
| * | | | | Small edits to actioncable/CHANGELOG.md | Jon Moss | 2016-12-27 | 1 | -2/+2 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | [ci skip] - capitalize WebSocket | ||||
* | | | | Merge pull request #27471 from maclover7/jm-rm-spaces | Jon Moss | 2016-12-27 | 2 | -5/+5 |
|\ \ \ \ | | | | | | | | | | | Light CHANGELOG.md linting | ||||
| * | | | | Add backticks to show shell command | Jon Moss | 2016-12-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | Remove random extra spaces from Action Pack and Railties CHANGELOG.md | Jon Moss | 2016-12-27 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | bundle update | Matthew Draper | 2016-12-27 | 1 | -6/+6 |
|/ / / / | |||||
* | | | | Merge pull request #27469 from ota42y/ota42y/renderers_typo_fix | प्रथमेश Sonpatki | 2016-12-27 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | renderers typo fix [ci skip] | ||||
| * | | | renderers typo fix [ci skip] | ota42y | 2016-12-27 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #27459 from kamipo/restore_gemfile_lock_entries | Matthew Draper | 2016-12-27 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Restore missing Gemfile.lock entries | ||||
| * | | | Restore missing Gemfile.lock entries | Ryuta Kamizono | 2016-12-27 | 1 | -0/+2 |
|/ / / | | | | | | | | | | These lines were lost in https://github.com/rails/rails/commit/774be3ea3b9d25ab69daf11c5071deaf053d7d5b#diff-e79a60dc6b85309ae70a6ea8261eaf95L204. | ||||
* | | | bundle update | Matthew Draper | 2016-12-26 | 2 | -43/+30 |
| | | | |||||
* | | | assert_equal takes expectation first | Akira Matsuda | 2016-12-26 | 18 | -73/+73 |
| | | | |||||
* | | | Merge pull request #27451 from rails/sdoc-rc1 | Akira Matsuda | 2016-12-25 | 2 | -5/+5 |
|\ \ \ | | | | | | | | | Bump sdoc to rc1 which includes zzak/sdoc#98 | ||||
| * | | | Bump sdoc to rc1 which includes zzak/sdoc#98 | Zachary Scott | 2016-12-25 | 2 | -5/+5 |
|/ / / | |||||
* | | | Correct indent-accounting in controller route generation | Matthew Draper | 2016-12-25 | 2 | -12/+15 |
| | | | | | | | | | | | | | | | | | | Fixes #27447 [Matthew Draper & Yuuji Yaginuma] | ||||
* | | | "Use assert_nil if expecting nil from ...:in `...'. This will fail in ↵ | Akira Matsuda | 2016-12-25 | 3 | -5/+4 |
| | | | | | | | | | | | | minitest 6." | ||||
* | | | Expectation first | Akira Matsuda | 2016-12-25 | 2 | -5/+5 |
| | | | |||||
* | | | CI against ruby 2.4.0 | Akira Matsuda | 2016-12-25 | 1 | -1/+1 |
| | | | |||||
* | | | "Use assert_nil if expecting nil from ...:in `...'. This will fail in MT6." | Akira Matsuda | 2016-12-25 | 6 | -15/+15 |
| | | | |||||
* | | | Merge pull request #27448 from kamipo/no_need_doc_for_nodoc_classes | Akira Matsuda | 2016-12-25 | 5 | -15/+15 |
|\ \ \ | | | | | | | | | No need `:doc:` for `:nodoc:` classes [ci skip] | ||||
| * | | | No need `:doc:` for `:nodoc:` classes [ci skip] | Ryuta Kamizono | 2016-12-25 | 5 | -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 Matsuda | 2016-12-25 | 69 | -196/+196 |
| | | | | |||||
* | | | | public methods can be placed after private ones if you want to | Akira Matsuda | 2016-12-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | Abuse of protected in guides | Akira Matsuda | 2016-12-25 | 3 | -5/+5 |
| | | | | |||||
* | | | | Privatize unneededly protected methods in Railties | Akira Matsuda | 2016-12-25 | 25 | -135/+136 |
| | | | | |||||
* | | | | Privatize some methods that were originally protected | Akira Matsuda | 2016-12-25 | 1 | -25/+27 |
| | | | | |||||
* | | | | Prefer class << self; def over def self. | Akira Matsuda | 2016-12-25 | 1 | -200/+200 |
|/ / / | |||||
* | | | AR::ConnectionAdapters::PostgreSQL::Name#parts is called from other instances | Akira Matsuda | 2016-12-25 | 1 | -4/+6 |
| | | | |||||
* | | | `protected` here doesn't protect anything | Akira Matsuda | 2016-12-25 | 1 | -26/+25 |
| | | | | | | | | | | | | there aren't any instance method defined in this class | ||||
* | | | Shuffle travis matrix | Matthew Draper | 2016-12-25 | 1 | -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 Record | Akira Matsuda | 2016-12-24 | 26 | -158/+145 |
| | | | |||||
* | | | No need to nodoc private methods | Akira Matsuda | 2016-12-24 | 11 | -31/+31 |
| | | | |||||
* | | | Shave a couple of allocations off Journey scan & parse | Matthew Draper | 2016-12-25 | 4 | -203/+208 |
| | | | |||||
* | | | self. is not needed when calling its own instance method | Akira Matsuda | 2016-12-24 | 1 | -2/+1 |
| | | |