aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #26543 from y-yagi/use_rails_command_in_restart_testKasper Timm Hansen2016-09-191-7/+7
|\
| * use rails command in restart task testyuuji.yaginuma2016-09-191-7/+7
* | Merge pull request #26448 from kamipo/remove_collection_association_uniqKasper Timm Hansen2016-09-181-1/+0
|\ \
| * | Remove unnecessry `alias uniq distinct` for collection associationRyuta Kamizono2016-09-101-1/+0
* | | Merge pull request #26534 from Neodelf/new_branch_nameJon Moss2016-09-177-7/+7
|\ \ \
| * | | [ci skip] Fixed commas according to Oxford comma in rdoc and guidesAndrey Molchanov2016-09-177-7/+7
* | | | Merge pull request #26446 from kamipo/rename_type_var_name_to_typeEileen M. Uchitelle2016-09-171-10/+8
|\ \ \ \
| * | | | Rename variable name that returning `type_for` to `type` from `column`Ryuta Kamizono2016-09-111-10/+8
| | |/ / | |/| |
* | | | Merge pull request #26497 from koppen/26496-touch_with_optimistic_lockingEileen M. Uchitelle2016-09-173-1/+9
|\ \ \ \
| * | | | Clear attribute changes after handling lockingJakob Skjerning2016-09-143-1/+9
* | | | | Merge pull request #26532 from Neodelf/new_branch_nameप्रथमेश Sonpatki2016-09-171-2/+11
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | [ci skip] Fix bad examples in rdocAndrey Molchanov2016-09-171-2/+11
|/ / / /
* | | | Merge pull request #26528 from y-yagi/fix_formatting_of_fetchप्रथमेश Sonpatki2016-09-171-3/+3
|\ \ \ \
| * | | | fix formatting of `Cache::Store#fetch` [ci skip]yuuji.yaginuma2016-09-171-3/+3
| | |_|/ | |/| |
* | | | Merge pull request #26523 from maclover7/jm-grammar-26382Rafael França2016-09-161-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix small grammar issue introduced in #26382Jon Moss2016-09-161-1/+2
|/ / /
* | | Merge pull request #26516 from grosser/grosser/assertRafael França2016-09-1675-362/+362
|\ \ \
| * | | improve error message when include assertions failMichael Grosser2016-09-1675-362/+362
* | | | Merge pull request #26514 from louim/patch-1Rafael França2016-09-161-8/+8
|\ \ \ \
| * | | | Update ActiveModel::Dirty Doc [ci skip]Louis-Michel Couture2016-09-161-8/+8
| |/ / /
* | | | Merge pull request #26509 from claudiob/rename-asRafael França2016-09-161-1/+1
|\ \ \ \
| * | | | Rename test to match what it doesclaudiob2016-09-151-1/+1
* | | | | Merge pull request #26507 from Neodelf/actionview_duplicateRafael França2016-09-162-6/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | DRYing duplicate methodsAndrey Molchanov2016-09-162-6/+2
* | | | | Force correct namespace when using TransactionManagerArthur Neves2016-09-161-1/+1
* | | | | Merge pull request #26510 from y-yagi/fix_typo_in_add_column_docJon Moss2016-09-151-1/+1
|\ \ \ \ \
| * | | | | fix typo in `add_column` doc [ci skip]yuuji.yaginuma2016-09-161-1/+1
* | | | | | Merge pull request #26508 from louim/patch-1Jon Moss2016-09-151-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Update ActiveModel::Dirty Doc [ci skip]Louis-Michel Couture2016-09-151-1/+1
|/ / / / /
* | | | | bug report template for migrations (#26488)Girish Sonawane2016-09-153-0/+130
* | | | | Merge pull request #26469 from y-yagi/remove_useless_optionRafael França2016-09-141-5/+0
|\ \ \ \ \
| * | | | | remove useless `gemfile` optionyuuji.yaginuma2016-09-121-5/+0
* | | | | | Merge pull request #26498 from FriedSock/correct-render-text-deprecation-messageRafael França2016-09-141-1/+1
|\ \ \ \ \ \
| * | | | | | Correct `render text:` deprecation messageJack Bracewell2016-09-141-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #26477 from kirs/action_dispatch-assert_responseRafael França2016-09-142-2/+29
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Improve assert_response helperKir Shatrov2016-09-142-2/+29
| | |_|_|/ | |/| | |
* | | | | Merge pull request #26487 from prathamesh-sonpatki/move-preload-section-upRichard Schneeman2016-09-141-7/+8
|\ \ \ \ \
| * | | | | Move comment about disconnecting pool close to comment about preloadPrathamesh Sonpatki2016-09-141-7/+8
* | | | | | Merge pull request #26486 from y-yagi/fix_broken_testRafael França2016-09-141-1/+1
|\ \ \ \ \ \
| * | | | | | fix broken generators testyuuji.yaginuma2016-09-142-2/+2
| |/ / / / /
* | | | | | Fix test for the edge generatorRafael Mendonça França2016-09-141-1/+1
* | | | | | Override the github git source instead of changing manually all entriesRafael Mendonça França2016-09-142-62/+68
| |_|_|/ / |/| | | |
* | | | | Merge pull request #26489 from kamipo/fix_broken_comments_indentationXavier Noria2016-09-1467-1665/+1670
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix broken comments indentation caused by rubocop auto-correct [ci skip]Ryuta Kamizono2016-09-1467-1665/+1670
|/ / / /
* | | | Do not point to the 5-0-stable branchRafael Mendonça França2016-09-131-1/+1
* | | | Merge pull request #26484 from yahonda/mysql2_ambiguous_first_argumentsRafael França2016-09-131-2/+2
|\ \ \ \
| * | | | Address `warning: ambiguous first argument; put parentheses or a space even a...Yasuo Honda2016-09-131-2/+2
|/ / / /
* | | | 5-0-backport: activerecord/mysql2: Avoid setting @connection to nil, just clo...Dylan Thacker-Smith2016-09-131-0/+5
* | | | Merge pull request #26314 from frodsan/puma-ar-disconnectRichard Schneeman2016-09-131-0/+8
|\ \ \ \
| * | | | Disconnects all connections in the pool before forking.Francesco Rodriguez2016-08-291-0/+8