| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #27018 from alexanderkustov/alexanderkustov/update-docs-Ac... | Vipul A M | 2016-11-11 | 1 | -0/+12 |
|\ |
|
| * | better docs for ActionView::ViewPaths#prepend_view_path | Alexander Kustov | 2016-11-12 | 1 | -0/+12 |
* | | adds a missing dot [ci skip] | Xavier Noria | 2016-11-11 | 1 | -1/+1 |
* | | adds support for arbitrary hashes in strong parameters | Xavier Noria | 2016-11-11 | 4 | -3/+101 |
* | | Merge pull request #27008 from kirs/new-column-from-field | Rafael França | 2016-11-11 | 4 | -38/+48 |
|\ \
| |/
|/| |
|
| * | Refactor column initialization into `new_column_from_field` | Kir Shatrov | 2016-11-11 | 4 | -38/+48 |
|/ |
|
* | Merge pull request #26978 from matthewd/query-cache-pool | Matthew Draper | 2016-11-10 | 4 | -4/+73 |
|\ |
|
| * | Configure query caching (per thread) on the connection pool | Matthew Draper | 2016-11-06 | 4 | -2/+71 |
| * | Try harder to avoid making a connection while releasing it | Matthew Draper | 2016-11-06 | 1 | -2/+2 |
* | | Merge pull request #27006 from bogdanvlviv/ar_querying_guide | Jon Moss | 2016-11-10 | 1 | -0/+3 |
|\ \ |
|
| * | | Update guides/source/active_record_querying.md | bogdanvlviv | 2016-11-10 | 1 | -0/+3 |
|/ / |
|
* | | Merge pull request #26820 from y-yagi/add_bang_merge_to_parameters | Rafael França | 2016-11-10 | 3 | -0/+28 |
|\ \ |
|
| * | | add `ActionController::Parameters#merge!` | yuuji.yaginuma | 2016-10-18 | 3 | -0/+28 |
* | | | Mysql2::Client::FOUND_ROWS should be defined in all currently supported versi... | Akira Matsuda | 2016-11-10 | 1 | -6/+4 |
* | | | Merge pull request #26988 from Paxa/connection_pool_stat | Rafael França | 2016-11-08 | 3 | -0/+47 |
|\ \ \ |
|
| * | | | Add ActiveRecord::Base.connection_pool.stat | Pavel | 2016-11-09 | 3 | -0/+47 |
* | | | | [ci skip] Expand context on `:cache_hits`. | Kasper Timm Hansen | 2016-11-08 | 1 | -5/+7 |
* | | | | Merge pull request #26993 from yui-knk/render_collection.action_view | Kasper Timm Hansen | 2016-11-08 | 1 | -0/+16 |
|\ \ \ \ |
|
| * | | | | [ci skip] Add `render_collection.action_view` entry to AS instrumentation | yui-knk | 2016-11-08 | 1 | -0/+16 |
|/ / / / |
|
* | | | | Merge pull request #26990 from kirs/upgrade-jruby | Rafael França | 2016-11-07 | 1 | -2/+2 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Upgrade JRuby to satisfy gemfile | Kir Shatrov | 2016-11-07 | 1 | -2/+2 |
|/ / / |
|
* | | | Merge pull request #26982 from bogdanvlviv/started_guide | Kasper Timm Hansen | 2016-11-07 | 1 | -2/+2 |
|\ \ \ |
|
| * | | | Fix 'Getting Started with Rails' [ci skip] | bogdanvlviv | 2016-11-06 | 1 | -2/+2 |
| | |/
| |/| |
|
* | | | Merge pull request #26986 from bogdanvlviv/docs_migrations | Eileen M. Uchitelle | 2016-11-06 | 1 | -2/+2 |
|\ \ \
| |/ /
|/| | |
|
| * | | Add missing spaces [ci skip] | bogdanvlviv | 2016-11-07 | 1 | -2/+2 |
|/ / |
|
* | | Merge pull request #26909 from matthewd/query-cache-connection | Matthew Draper | 2016-11-06 | 4 | -40/+75 |
|\ \ |
|
| * | | Clear query cache during checkin, instead of an execution callback | Matthew Draper | 2016-10-27 | 4 | -40/+75 |
* | | | Merge pull request #26972 from kamipo/avoid_unscope_order_when_limit_value_pr... | Rafael França | 2016-11-05 | 2 | -8/+17 |
|\ \ \ |
|
| * | | | Avoid `unscope(:order)` when `limit_value` is presented for `count` | Ryuta Kamizono | 2016-11-06 | 2 | -8/+17 |
* | | | | Erubis is not actually used in AR | Akira Matsuda | 2016-11-06 | 1 | -2/+2 |
|/ / / |
|
* | | | Merge pull request #26969 from y-yagi/remove_unused_requires | Rafael França | 2016-11-05 | 1 | -3/+0 |
|\ \ \ |
|
| * | | | remove unused require | yuuji.yaginuma | 2016-11-05 | 1 | -3/+0 |
* | | | | Merge pull request #26971 from damireh/patch-1 | Jon Moss | 2016-11-05 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | Use local variable instead of instance variable [ci skip] | Daniel Amireh | 2016-11-05 | 1 | -1/+1 |
|/ / / / |
|
* | | | | Tweaking some test data due to sprintf behavior change in 2.4 | Akira Matsuda | 2016-11-05 | 1 | -5/+5 |
* | | | | Show what was the error when assertion has failed | Akira Matsuda | 2016-11-05 | 1 | -1/+1 |
* | | | | Less method invocation | Akira Matsuda | 2016-11-05 | 1 | -1/+1 |
* | | | | Merge pull request #26967 from headius/bad_threading_test | Aaron Patterson | 2016-11-04 | 1 | -5/+5 |
|\ \ \ \ |
|
| * | | | | Use different name for main and thread connection variable. | Charles Oliver Nutter | 2016-11-04 | 1 | -5/+5 |
| |/ / / |
|
* | | | | Merge pull request #26965 from rothhound/update_sqlite3 | Guillermo Iguaran | 2016-11-04 | 1 | -3/+3 |
|\ \ \ \ |
|
| * | | | | Update sqlite3 | Gianfranco Montoya | 2016-11-04 | 1 | -3/+3 |
|/ / / / |
|
* | | | | Merge pull request #26536 from y-yagi/change_increment_and_decrement_to_publi... | Arthur Nogueira Neves | 2016-11-04 | 1 | -2/+2 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | change `MemCacheStore#increment` and `MemCacheStore#decrement` to public API ... | yuuji.yaginuma | 2016-09-18 | 1 | -2/+2 |
* | | | | Don't assign default attributes until after loading schema | Sean Griffin | 2016-11-03 | 1 | -1/+1 |
* | | | | Merge pull request #26455 from kamipo/move_test_quoting_classes | Arthur Nogueira Neves | 2016-11-03 | 2 | -13/+4 |
|\ \ \ \ |
|
| * | | | | Move `test_quoting_classes` into `test/cases/quoting_test.rb` | Ryuta Kamizono | 2016-10-29 | 2 | -13/+4 |
* | | | | | Merge pull request #24202 from Sen-Zhang/fix_datetime_error | Arthur Nogueira Neves | 2016-11-03 | 3 | -1/+13 |
|\ \ \ \ \ |
|
| * | | | | | fix datatime error | Sen-Zhang | 2016-11-01 | 3 | -1/+13 |
* | | | | | | Fixes TypeError Exception when cache counter value equals nil (#26940) | Daniel E. Garcia Shulman | 2016-11-02 | 2 | -1/+6 |
* | | | | | | Use tr instead of gsub | Akira Matsuda | 2016-11-02 | 1 | -1/+1 |