aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove deprecated key_file_pathAndrew White2016-11-132-14/+0
* Minor corrections to #26905Andrew White2016-11-132-2/+2
* Fix typo in constant referenceAndrew White2016-11-131-1/+1
* It's a NAN not InfinityAndrew White2016-11-131-1/+1
* Use literal values in assertionsAndrew White2016-11-131-6/+4
* Merge pull request #26933 from prathamesh-sonpatki/fix-26877Andrew White2016-11-132-1/+23
|\
| * Fix an issue with JSON encoding of "Infinity" and "NaN" valuesPrathamesh Sonpatki2016-10-302-1/+23
* | Merge pull request #27024 from vipulnsward/changelog-editsAndrew White2016-11-134-15/+15
|\ \
| * | 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.bogdanvlviv2016-10-2742-75/+77
* | | | removes unconventional "then" in case expressionXavier Noria2016-11-131-1/+1
* | | | revises style in recent code (of mine)Xavier Noria2016-11-131-5/+7
* | | | Merge pull request #27019 from djpowers/patch-1Jon Moss2016-11-122-3/+3
|\ \ \ \
| * | | | Fix spelling in API docsDave Powers2016-11-122-3/+3
* | | | | 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 optionseunghwan oh2016-06-021-1/+6
* | | | | | Merge pull request #27022 from kamipo/add_nodoc_to_table_structureAndrew White2016-11-121-9/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add `:nodoc` to `table_structure`Ryuta Kamizono2016-11-121-9/+2
* | | | | | 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