aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Use literal values in assertionsAndrew White2016-11-131-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the method you're testing to generate expected values can lead to bugs being masked.
* | | | | | Merge pull request #26933 from prathamesh-sonpatki/fix-26877Andrew White2016-11-132-1/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix an issue with JSON encoding of "Infinity" and "NaN" values
| * | | | | | Fix an issue with JSON encoding of "Infinity" and "NaN" valuesPrathamesh Sonpatki2016-10-302-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When `as_json` returns `Infinity` or `NaN` as the value of any of the key, we don't used to call `as_json` on it as it was treated as primitive. - This used to pass `Infinity` or `NaN` to `JSON.generate` and Ruby used to throw an error for `Infinity/NaN not allowed in JSON.` - This patch changes the code to call `as_json` on these primitives so that they are converted to proper values before being passed to `JSON.generate`. - Fixes #26877.
* | | | | | | Merge pull request #27024 from vipulnsward/changelog-editsAndrew White2016-11-134-15/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Changelog edits
| * | | | | | | Changelog editsVipul A M2016-11-124-15/+15
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #26905 from bogdanvlviv/docsAndrew White2016-11-1342-75/+77
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add missing `+` around a some literals.
| * | | | | | | Add missing `+` around a some literals.bogdanvlviv2016-10-2742-75/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainly around `nil` [ci skip]
* | | | | | | | removes unconventional "then" in case expressionXavier Noria2016-11-131-1/+1
| | | | | | | |
* | | | | | | | revises style in recent code (of mine)Xavier Noria2016-11-131-5/+7
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This alternative case expressions read better for my taste, and look more uniform in a file where other similar case expressions are used (without dynamic clauses).
* | | | | | | Merge pull request #27019 from djpowers/patch-1Jon Moss2016-11-122-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix spelling in API documentation
| * | | | | | | Fix spelling in API docsDave Powers2016-11-122-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Add test for #25248Sean Griffin2016-11-121-0/+10
| | | | | | | |
* | | | | | | | Merge pull request #25248 from bluesh55:features/skip-coffeeSean Griffin2016-11-121-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Add --skip-coffee generating option
| * | | | | | | | Add --skip-coffee generating optionseunghwan oh2016-06-021-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage `rails new awesome-project --skip-coffee`
* | | | | | | | | Merge pull request #27022 from kamipo/add_nodoc_to_table_structureAndrew White2016-11-121-9/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Add `:nodoc` to `table_structure`
| * | | | | | | | Add `:nodoc` to `table_structure`Ryuta Kamizono2016-11-121-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to #27008. `table_structure` is an internal method so it is better to hide it in the doc. And alias `table_structure` to `column_definitions` to remove the duplicated `columns` method in the sqlite3 adapter.
* | | | | | | | | significant speedup of AC::Parameters#permitXavier Noria2016-11-122-1/+8
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation of AC::Parameters#permit builds permitted hashes and then calls permit! on them. This filtering is recursive, so we call permit! on terminal branches, but then ascendants call permit! on themselves when the recursion goes up the stack, which recurses all the way down again because permit! is recursive itself. Repeat this for every parent node and you get some scary O-something going on that I don't even want to compute. Instead, since the whole point of the permit recursion is to build permitted hashes along the way and at that point you know you've just come up with a valid filtered version, you can already switch the toggle on the spot. I have seen 2x speedups in casual benchmarks with small structures. As the previous description shows, the difference in performance is going to be a function of the nesting. Note that that the involved methods are private and used only by permit.
* | | | | | | | Merge pull request #27018 from ↵Vipul A M2016-11-111-0/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alexanderkustov/alexanderkustov/update-docs-ActionView better docs for ActionView::ViewPaths#prepend_view_path [ci skip]
| * | | | | | | | better docs for ActionView::ViewPaths#prepend_view_pathAlexander Kustov2016-11-121-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ✂️ extra line
* | | | | | | | | adds a missing dot [ci skip]Xavier Noria2016-11-111-1/+1
| | | | | | | | |
* | | | | | | | | adds support for arbitrary hashes in strong parametersXavier Noria2016-11-114-3/+101
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #27008 from kirs/new-column-from-fieldRafael França2016-11-114-38/+48
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Refactor column initialization into `new_column_from_field`
| * | | | | | | Refactor column initialization into `new_column_from_field`Kir Shatrov2016-11-114-38/+48
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | that accepts results of SHOW FIELDS
* | | | | | | Merge pull request #26978 from matthewd/query-cache-poolMatthew Draper2016-11-104-4/+73
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Configure query caching (per thread) on the connection pool
| * | | | | | | Configure query caching (per thread) on the connection poolMatthew Draper2016-11-064-2/+71
| | | | | | | |
| * | | | | | | Try harder to avoid making a connection while releasing itMatthew Draper2016-11-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connected? doesn't mean what we need here.
* | | | | | | | Merge pull request #27006 from bogdanvlviv/ar_querying_guideJon Moss2016-11-101-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update guides/source/active_record_querying.md
| * | | | | | | | Update guides/source/active_record_querying.mdbogdanvlviv2016-11-101-0/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add info about updating locking column value Follow #26050 and #26871 [ci skip]
* | | | | | | | Merge pull request #26820 from y-yagi/add_bang_merge_to_parametersRafael França2016-11-103-0/+28
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | add `ActionController::Parameters#merge!`
| * | | | | | | add `ActionController::Parameters#merge!`yuuji.yaginuma2016-10-183-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method has the same behavior as `Hash#merge!`, returns current `ActionController::Parameters`.
* | | | | | | | Mysql2::Client::FOUND_ROWS should be defined in all currently supported ↵Akira Matsuda2016-11-101-6/+4
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | versions of mysql2
* | | | | | | Merge pull request #26988 from Paxa/connection_pool_statRafael França2016-11-083-0/+47
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add ActiveRecord::Base.connection_pool.stat
| * | | | | | | Add ActiveRecord::Base.connection_pool.statPavel2016-11-093-0/+47
| | | | | | | |
* | | | | | | | [ci skip] Expand context on `:cache_hits`.Kasper Timm Hansen2016-11-081-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to explain the key is only there in certain cases.
* | | | | | | | Merge pull request #26993 from yui-knk/render_collection.action_viewKasper Timm Hansen2016-11-081-0/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ci skip] Add `render_collection.action_view` entry to AS instrumenta…
| * | | | | | | | [ci skip] Add `render_collection.action_view` entry to AS instrumentationyui-knk2016-11-081-0/+16
|/ / / / / / / /
* | | | | | | | Merge pull request #26990 from kirs/upgrade-jrubyRafael França2016-11-071-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Upgrade JRuby to satisfy gemfile
| * | | | | | | Upgrade JRuby to satisfy gemfileKir Shatrov2016-11-071-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #26982 from bogdanvlviv/started_guideKasper Timm Hansen2016-11-071-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix 'Getting Started with Rails' [ci skip]
| * | | | | | | Fix 'Getting Started with Rails' [ci skip]bogdanvlviv2016-11-061-2/+2
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `bin/rails generate controller Comments` creates files app/assets/javascripts/comments.coffee app/assets/stylesheets/comments.scss not app/assets/javascripts/comment.coffee app/assets/stylesheets/comment.scss
* | | | | | | Merge pull request #26986 from bogdanvlviv/docs_migrationsEileen M. Uchitelle2016-11-061-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Add missing spaces [ci skip]
| * | | | | | 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 callback
| * | | | | | Clear query cache during checkin, instead of an execution callbackMatthew Draper2016-10-274-40/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It doesn't make sense for the query cache to persist while a connection moves through the pool and is assigned to a new thread. [Samuel Cochran & Matthew Draper]
* | | | | | | Merge pull request #26972 from ↵Rafael França2016-11-052-8/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/avoid_unscope_order_when_limit_value_present Avoid `unscope(:order)` when `limit_value` is presented for `count`
| * | | | | | | Avoid `unscope(:order)` when `limit_value` is presented for `count`Ryuta Kamizono2016-11-062-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `limit_value` is presented, records fetching order is very important for performance. Should not unscope the order in the case.
* | | | | | | | 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 require
| * | | | | | | remove unused requireyuuji.yaginuma2016-11-051-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | YAML and ERB were removed at 971d510
* | | | | | | | Merge pull request #26971 from damireh/patch-1Jon Moss2016-11-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use local variable instead of instance variable [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 05:26:55 +0000