aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Format and send logs to logger.fatal from DebugExceptions instead of calling ↵Vipul A M2016-11-123-7/+18
| | | | | | fatal multiple times. Expose tags_text from TaggedLogging to be used for log formatting Fixes #26134
* 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]
| * | | | Use local variable instead of instance variable [ci skip]Daniel Amireh2016-11-051-1/+1
|/ / / / | | | | | | | | Update render yield docs to use `search` local variable instead of `@q` instance variable
* | | | Tweaking some test data due to sprintf behavior change in 2.4Akira Matsuda2016-11-051-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.3: sprintf('%0.1f', 5.55) #=> "5.5" 2.4: sprintf('%0.1f', 5.55) #=> "5.6" see: https://github.com/ruby/ruby/commit/6ed8c79ddb11ccfb580bb0a22b22cc1362250255 and https://github.com/ruby/ruby/commit/295f60b94d5ff6551fab7c55e18d1ffa6a4cf7e3
* | | | Show what was the error when assertion has failedAkira Matsuda2016-11-051-1/+1
| | | | | | | | | | | | | | | | this test case fails with ruby 2.4, so we want to see what's actually happening
* | | | Less method invocationAkira Matsuda2016-11-051-1/+1
| | | |
* | | | Merge pull request #26967 from headius/bad_threading_testAaron Patterson2016-11-041-5/+5
|\ \ \ \ | | | | | | | | | | Use different name for main and thread connection variable.
| * | | | Use different name for main and thread connection variable.Charles Oliver Nutter2016-11-041-5/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | Under JRuby, the updates of the one shared variable interleaved, causing threads to pick up each others' connections. I'm amazed this worked on MRI.
* | | | Merge pull request #26965 from rothhound/update_sqlite3Guillermo Iguaran2016-11-041-3/+3
|\ \ \ \ | | | | | | | | | | Update sqlite3
| * | | | Update sqlite3Gianfranco Montoya2016-11-041-3/+3
|/ / / /
* | | | Merge pull request #26536 from ↵Arthur Nogueira Neves2016-11-041-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | y-yagi/change_increment_and_decrement_to_public_api change `MemCacheStore#increment` and `MemCacheStore#decrement` to public API [ci skip]
| * | | change `MemCacheStore#increment` and `MemCacheStore#decrement` to public API ↵yuuji.yaginuma2016-09-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] I'm not sure why these methods not public. But these methods are public in other cache stores, I think that may be in public. Ref: http://edgeapi.rubyonrails.org/classes/ActiveSupport/Cache/Store.html#method-i-increment http://edgeapi.rubyonrails.org/classes/ActiveSupport/Cache/FileStore.html#method-i-increment http://edgeapi.rubyonrails.org/classes/ActiveSupport/Cache/MemoryStore.html#method-i-increment http://edgeapi.rubyonrails.org/classes/ActiveSupport/Cache/NullStore.html#method-i-increment
* | | | Don't assign default attributes until after loading schemaSean Griffin2016-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the call to `.define_attribute_methods` actually ends up loading the schema (*very* hard to do, as it requires the object being created without `allocate` having been called, but it can be done by manually calling `initialize` from inside `marshal_load` if you're crazy), the value of `_default_attributes` will change from that call.
* | | | Merge pull request #26455 from kamipo/move_test_quoting_classesArthur Nogueira Neves2016-11-032-13/+4
|\ \ \ \ | | | | | | | | | | Move `test_quoting_classes` into `test/cases/quoting_test.rb`
| * | | | Move `test_quoting_classes` into `test/cases/quoting_test.rb`Ryuta Kamizono2016-10-292-13/+4
| | | | |
* | | | | Merge pull request #24202 from Sen-Zhang/fix_datetime_errorArthur Nogueira Neves2016-11-033-1/+13
|\ \ \ \ \ | | | | | | | | | | | | fix datatime error
| * | | | | fix datatime errorSen-Zhang2016-11-013-1/+13
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-01 09:04:31 +0000