Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | 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 | |
|/ / / / / / / / | ||||||
* | | | | | | | | bug report template for migrations (#26488) | Girish Sonawane | 2016-09-15 | 3 | -0/+130 | |
* | | | | | | | | Merge pull request #26469 from y-yagi/remove_useless_option | Rafael França | 2016-09-14 | 1 | -5/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | remove useless `gemfile` option | yuuji.yaginuma | 2016-09-12 | 1 | -5/+0 | |
* | | | | | | | | | Merge pull request #26498 from FriedSock/correct-render-text-deprecation-message | Rafael França | 2016-09-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Correct `render text:` deprecation message | Jack Bracewell | 2016-09-14 | 1 | -1/+1 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #26477 from kirs/action_dispatch-assert_response | Rafael França | 2016-09-14 | 2 | -2/+29 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Improve assert_response helper | Kir Shatrov | 2016-09-14 | 2 | -2/+29 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #26487 from prathamesh-sonpatki/move-preload-section-up | Richard Schneeman | 2016-09-14 | 1 | -7/+8 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Move comment about disconnecting pool close to comment about preload | Prathamesh Sonpatki | 2016-09-14 | 1 | -7/+8 | |
* | | | | | | | | | Merge pull request #26486 from y-yagi/fix_broken_test | Rafael França | 2016-09-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fix broken generators test | yuuji.yaginuma | 2016-09-14 | 2 | -2/+2 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Fix test for the edge generator | Rafael Mendonça França | 2016-09-14 | 1 | -1/+1 | |
* | | | | | | | | | Override the github git source instead of changing manually all entries | Rafael Mendonça França | 2016-09-14 | 2 | -62/+68 | |
| |_|_|/ / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #26489 from kamipo/fix_broken_comments_indentation | Xavier Noria | 2016-09-14 | 67 | -1665/+1670 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fix broken comments indentation caused by rubocop auto-correct [ci skip] | Ryuta Kamizono | 2016-09-14 | 67 | -1665/+1670 | |
|/ / / / / / / | ||||||
* | | | | | | | Do not point to the 5-0-stable branch | Rafael Mendonça França | 2016-09-13 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #26484 from yahonda/mysql2_ambiguous_first_arguments | Rafael França | 2016-09-13 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Address `warning: ambiguous first argument; put parentheses or a space even a... | Yasuo Honda | 2016-09-13 | 1 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | 5-0-backport: activerecord/mysql2: Avoid setting @connection to nil, just clo... | Dylan Thacker-Smith | 2016-09-13 | 1 | -0/+5 | |
* | | | | | | | Merge pull request #26314 from frodsan/puma-ar-disconnect | Richard Schneeman | 2016-09-13 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Disconnects all connections in the pool before forking. | Francesco Rodriguez | 2016-08-29 | 1 | -0/+8 | |
* | | | | | | | | Merge pull request #26466 from y-yagi/remove_duplicated_fixture_set_names | Arthur Nogueira Neves | 2016-09-13 | 3 | -3/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | remove duplicated fixture set names | yuuji.yaginuma | 2016-09-12 | 3 | -3/+5 | |
* | | | | | | | | | Merge pull request #26478 from girishso/fix-guides-for-partial-render-as-option | Eileen M. Uchitelle | 2016-09-13 | 1 | -7/+7 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | |