aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Format and send logs to logger.fatal from DebugExceptions instead of calling ...Vipul A M2016-11-123-7/+18
* significant speedup of AC::Parameters#permitXavier Noria2016-11-122-1/+8
* Merge pull request #27018 from alexanderkustov/alexanderkustov/update-docs-Ac...Vipul A M2016-11-111-0/+12
|\
| * better docs for ActionView::ViewPaths#prepend_view_pathAlexander Kustov2016-11-121-0/+12
* | 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`Kir Shatrov2016-11-114-38/+48
|/
* Merge pull request #26978 from matthewd/query-cache-poolMatthew Draper2016-11-104-4/+73
|\
| * 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
* | Merge pull request #27006 from bogdanvlviv/ar_querying_guideJon Moss2016-11-101-0/+3
|\ \
| * | Update guides/source/active_record_querying.mdbogdanvlviv2016-11-101-0/+3
|/ /
* | Merge pull request #26820 from y-yagi/add_bang_merge_to_parametersRafael França2016-11-103-0/+28
|\ \
| * | add `ActionController::Parameters#merge!`yuuji.yaginuma2016-10-183-0/+28
* | | Mysql2::Client::FOUND_ROWS should be defined in all currently supported versi...Akira Matsuda2016-11-101-6/+4
* | | Merge pull request #26988 from Paxa/connection_pool_statRafael França2016-11-083-0/+47
|\ \ \
| * | | Add ActiveRecord::Base.connection_pool.statPavel2016-11-093-0/+47
* | | | [ci skip] Expand context on `:cache_hits`.Kasper Timm Hansen2016-11-081-5/+7
* | | | 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 instrumentationyui-knk2016-11-081-0/+16
|/ / / /
* | | | Merge pull request #26990 from kirs/upgrade-jrubyRafael França2016-11-071-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | 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]bogdanvlviv2016-11-061-2/+2
| | |/ | |/|
* | | Merge pull request #26986 from bogdanvlviv/docs_migrationsEileen M. Uchitelle2016-11-061-2/+2
|\ \ \ | |/ / |/| |
| * | 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 callbackMatthew Draper2016-10-274-40/+75
* | | Merge pull request #26972 from kamipo/avoid_unscope_order_when_limit_value_pr...Rafael França2016-11-052-8/+17
|\ \ \
| * | | Avoid `unscope(:order)` when `limit_value` is presented for `count`Ryuta Kamizono2016-11-062-8/+17
* | | | 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 requireyuuji.yaginuma2016-11-051-3/+0
* | | | Merge pull request #26971 from damireh/patch-1Jon Moss2016-11-051-1/+1
|\ \ \ \
| * | | | Use local variable instead of instance variable [ci skip]Daniel Amireh2016-11-051-1/+1
|/ / / /
* | | | Tweaking some test data due to sprintf behavior change in 2.4Akira Matsuda2016-11-051-5/+5
* | | | Show what was the error when assertion has failedAkira Matsuda2016-11-051-1/+1
* | | | 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.Charles Oliver Nutter2016-11-041-5/+5
| |/ / /
* | | | Merge pull request #26965 from rothhound/update_sqlite3Guillermo Iguaran2016-11-041-3/+3
|\ \ \ \
| * | | | Update sqlite3Gianfranco Montoya2016-11-041-3/+3
|/ / / /
* | | | Merge pull request #26536 from y-yagi/change_increment_and_decrement_to_publi...Arthur Nogueira Neves2016-11-041-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | change `MemCacheStore#increment` and `MemCacheStore#decrement` to public API ...yuuji.yaginuma2016-09-181-2/+2
* | | | Don't assign default attributes until after loading schemaSean Griffin2016-11-031-1/+1
* | | | 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`Ryuta Kamizono2016-10-292-13/+4
* | | | | Merge pull request #24202 from Sen-Zhang/fix_datetime_errorArthur Nogueira Neves2016-11-033-1/+13
|\ \ \ \ \
| * | | | | fix datatime errorSen-Zhang2016-11-013-1/+13