Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #26589 from kirs/ad-test-request-method | Arthur Nogueira Neves | 2016-09-22 | 2 | -1/+8 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix memoization bug on ActionDispatch::TestRequest#request_method= | Kir Shatrov | 2016-09-22 | 2 | -1/+8 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #26524 from y-yagi/add_check_of_argument | Richard Schneeman | 2016-09-22 | 2 | -0/+11 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | add check of argument | yuuji.yaginuma | 2016-09-17 | 2 | -0/+11 | |
* | | | | | | | Merge pull request #26562 from Neodelf/docs | Jon Moss | 2016-09-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [ci skip] Replace to closing tag | Andrey Molchanov | 2016-09-20 | 1 | -1/+1 | |
* | | | | | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2016-09-20 | 5 | -8/+10 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | [ci skip] Fix wrong rdoc-ref links, the format is {}[] not []{} | Prathamesh Sonpatki | 2016-09-14 | 1 | -2/+2 | |
| * | | | | | | | | [ci skip] Fix formatting of documentation of worker_pool method from AC::Serv... | Prathamesh Sonpatki | 2016-09-07 | 1 | -1/+1 | |
| * | | | | | | | | [ci skip] Fix formatting in Action Cable Connection::Base module docs | Prathamesh Sonpatki | 2016-09-07 | 1 | -1/+1 | |
| * | | | | | | | | :nail_care: [ci skip] | Prathamesh Sonpatki | 2016-09-07 | 1 | -1/+1 | |
| * | | | | | | | | Document that redirect* don't halt exucution. We explain more on this behavio... | Vipul A M | 2016-09-06 | 1 | -0/+2 | |
| * | | | | | | | | [ci fix] Fix API documentation for Streams module from Action Cable | Prathamesh Sonpatki | 2016-09-06 | 1 | -4/+4 | |
* | | | | | | | | | Merge pull request #26558 from kamipo/restore_gemfile_lock_entries | Andrew White | 2016-09-20 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Restore missing Gemfile.lock entries | Ryuta Kamizono | 2016-09-20 | 1 | -0/+2 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #26553 from y-yagi/fix_link_to_resque | Jon Moss | 2016-09-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fix link to `resque` [ci skip] | yuuji.yaginuma | 2016-09-20 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #26552 from rafaelfranca/fix-errors-details-storage | Rafael França | 2016-09-19 | 3 | -15/+32 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Always store errors details information with symbols | Rafael Mendonça França | 2016-09-19 | 3 | -15/+32 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #26447 from kamipo/reduce_array_allocation | Santiago Pastorino | 2016-09-19 | 1 | -3/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Reduce array allocation when `where` with passed hash | Ryuta Kamizono | 2016-09-10 | 1 | -3/+1 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #26543 from y-yagi/use_rails_command_in_restart_test | Kasper Timm Hansen | 2016-09-19 | 1 | -7/+7 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
| * | | | | | | | | use rails command in restart task test | yuuji.yaginuma | 2016-09-19 | 1 | -7/+7 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #26448 from kamipo/remove_collection_association_uniq | Kasper Timm Hansen | 2016-09-18 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | Remove unnecessry `alias uniq distinct` for collection association | Ryuta Kamizono | 2016-09-10 | 1 | -1/+0 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #26534 from Neodelf/new_branch_name | Jon Moss | 2016-09-17 | 7 | -7/+7 | |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | ||||||
| * | | | | | | [ci skip] Fixed commas according to Oxford comma in rdoc and guides | Andrey Molchanov | 2016-09-17 | 7 | -7/+7 | |
* | | | | | | | Merge pull request #26446 from kamipo/rename_type_var_name_to_type | Eileen M. Uchitelle | 2016-09-17 | 1 | -10/+8 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Rename variable name that returning `type_for` to `type` from `column` | Ryuta Kamizono | 2016-09-11 | 1 | -10/+8 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #26497 from koppen/26496-touch_with_optimistic_locking | Eileen M. Uchitelle | 2016-09-17 | 3 | -1/+9 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Clear attribute changes after handling locking | Jakob Skjerning | 2016-09-14 | 3 | -1/+9 | |
* | | | | | | | | Merge pull request #26532 from Neodelf/new_branch_name | प्रथमेश Sonpatki | 2016-09-17 | 1 | -2/+11 | |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | [ci skip] Fix bad examples in rdoc | Andrey Molchanov | 2016-09-17 | 1 | -2/+11 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #26528 from y-yagi/fix_formatting_of_fetch | प्रथमेश Sonpatki | 2016-09-17 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix formatting of `Cache::Store#fetch` [ci skip] | yuuji.yaginuma | 2016-09-17 | 1 | -3/+3 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #26523 from maclover7/jm-grammar-26382 | Rafael França | 2016-09-16 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Fix small grammar issue introduced in #26382 | Jon Moss | 2016-09-16 | 1 | -1/+2 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #26516 from grosser/grosser/assert | Rafael França | 2016-09-16 | 75 | -362/+362 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | improve error message when include assertions fail | Michael Grosser | 2016-09-16 | 75 | -362/+362 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge pull request #26514 from louim/patch-1 | Rafael França | 2016-09-16 | 1 | -8/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Update ActiveModel::Dirty Doc [ci skip] | Louis-Michel Couture | 2016-09-16 | 1 | -8/+8 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #26509 from claudiob/rename-as | Rafael França | 2016-09-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Rename test to match what it does | claudiob | 2016-09-15 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #26507 from Neodelf/actionview_duplicate | Rafael França | 2016-09-16 | 2 | -6/+2 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | DRYing duplicate methods | Andrey Molchanov | 2016-09-16 | 2 | -6/+2 | |
* | | | | | | | Force correct namespace when using TransactionManager | Arthur Neves | 2016-09-16 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #26510 from y-yagi/fix_typo_in_add_column_doc | Jon Moss | 2016-09-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix typo in `add_column` doc [ci skip] | yuuji.yaginuma | 2016-09-16 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #26508 from louim/patch-1 | Jon Moss | 2016-09-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Update ActiveModel::Dirty Doc [ci skip] | Louis-Michel Couture | 2016-09-15 | 1 | -1/+1 | |
|/ / / / / / / |