aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | Merge pull request #26466 from y-yagi/remove_duplicated_fixture_set_namesArthur Nogueira Neves2016-09-133-3/+5
|\ \ \ \ \
| * | | | | remove duplicated fixture set namesyuuji.yaginuma2016-09-123-3/+5
* | | | | | Merge pull request #26478 from girishso/fix-guides-for-partial-render-as-optionEileen M. Uchitelle2016-09-131-7/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | fixed guide to add correct documentation for partial render 'as' optionGirish S2016-09-131-7/+7
|/ / / / /
* | | | | [ci skip] Update Levenshtein code with better attribution.Kasper Timm Hansen2016-09-122-2/+6
* | | | | Merge pull request #26460 from kamipo/remove_useless_test_string_with_crazy_c...Sean Griffin2016-09-121-6/+2
|\ \ \ \ \
| * | | | | Remove useless `test_string_with_crazy_column`Ryuta Kamizono2016-09-111-6/+2
* | | | | | Merge pull request #26434 from dylanahsmith/mysql2-no-nil-connectionArthur Nogueira Neves2016-09-123-15/+28
|\ \ \ \ \ \
| * | | | | | activerecord/mysql2: Avoid setting @connection to nil, just close itDylan Thacker-Smith2016-09-083-15/+28
* | | | | | | Merge pull request #26459 from ysksn/add_test_for_activerecord_enumEileen M. Uchitelle2016-09-124-0/+43
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Add tests for ActiveRecord::Enum#enum when suffix specifiedYosuke Kabuto2016-09-124-0/+43
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #26458 from kamipo/remove_unused_require_threadSantiago Pastorino2016-09-111-1/+0
|\ \ \ \ \ \
| * | | | | | Remove unused `require "thread"` in `test/cases/attribute_methods/read_test.rb`Ryuta Kamizono2016-09-111-1/+0
| |/ / / / /
* | | | | | Merge pull request #26462 from kamipo/remove_duplicated_elsif_branchArthur Nogueira Neves2016-09-111-2/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove duplicated `elsif` branchRyuta Kamizono2016-09-111-2/+0
|/ / / / /
* | | | | Merge pull request #26449 from prathamesh-sonpatki/fixesGuillermo Iguaran2016-09-102-16/+16
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use :git for specifying dependencies from github with https protocolPrathamesh Sonpatki2016-09-102-16/+16
| | |_|/ | |/| |
* | | | Merge pull request #26450 from y-yagi/fix_broken_testArthur Nogueira Neves2016-09-101-0/+18
|\ \ \ \
| * | | | use correct Gemfile in `bin/setup` testyuuji.yaginuma2016-09-111-0/+18
| |/ / /
* | | | Merge pull request #26442 from kirs/action-controller-session-options-mutate1Arthur Nogueira Neves2016-09-102-1/+6
|\ \ \ \
| * | | | Do not mutate AC::TestRequest::DEFAULT_OPTIONSKir Shatrov2016-09-102-1/+6
| |/ / /
* | | | Merge pull request #26454 from kamipo/remove_outdated_todo_commentRichard Schneeman2016-09-101-1/+0
|\ \ \ \ | |/ / / |/| | |