Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Bump jbuilder dependency to version 2.5.0 for compatibility fixes | David Heinemeier Hansson | 2016-05-31 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #25206 from maclover7/jm-ap-tests | Rafael França | 2016-05-31 | 2 | -18/+18 | |
|\ \ \ \ \ | ||||||
| * | | | | | Move `Workshop` class definition | Jon Moss | 2016-05-30 | 2 | -18/+18 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #25179 from kamipo/reuse_result_of_associated_table | Sean Griffin | 2016-05-30 | 1 | -2/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Reuse a result of `table.associated_table(column)` in `AssociationQueryHandle... | Ryuta Kamizono | 2016-05-28 | 1 | -2/+3 | |
* | | | | | | Exists shouldn't error when used with `includes` | Sean Griffin | 2016-05-30 | 4 | -11/+9 | |
* | | | | | | Merge pull request #25194 from vipulnsward/use-cipher | Kasper Timm Hansen | 2016-05-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | use OpenSSL::Cipher instead of deprecated OpenSSL::Cipher::Cipher for cipher ... | Vipul A M | 2016-05-29 | 1 | -1/+1 | |
* | | | | | | | Ensure that instances of `ActiveModel::Errors` can be marshalled | Sean Griffin | 2016-05-30 | 2 | -2/+32 | |
* | | | | | | | Merge pull request #25175 from kamipo/fix_migration_class_names_in_tests | Kasper Timm Hansen | 2016-05-30 | 6 | -6/+6 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Fix migration class names in tests | Ryuta Kamizono | 2016-05-28 | 6 | -6/+6 | |
* | | | | | | | Tiny document fixes [ci skip] | Robin Dupret | 2016-05-30 | 2 | -2/+2 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #22240 from resource11/resource11-patch-1 | Arthur Nogueira Neves | 2016-05-29 | 1 | -4/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Issue 22240: adds link to list of instance methods [ci skip] | Kathleen McMahon | 2016-03-18 | 1 | -4/+4 | |
* | | | | | | | Merge pull request #24965 from arthurnn/arthurnn/conn_api | Arthur Nogueira Neves | 2016-05-29 | 7 | -37/+43 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add to_hash to specification | Arthur Neves | 2016-05-25 | 4 | -4/+7 | |
| * | | | | | | | Remove `name` from `establish_connection` | Arthur Neves | 2016-05-24 | 7 | -33/+32 | |
| * | | | | | | | Move establish_connection to handler | Arthur Neves | 2016-05-24 | 3 | -14/+18 | |
* | | | | | | | | Merge pull request #25184 from prathamesh-sonpatki/move-up-framework-initiali... | David Heinemeier Hansson | 2016-05-29 | 11 | -35/+37 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Move new default initializers into separate directory | Prathamesh Sonpatki | 2016-05-28 | 11 | -35/+37 | |
* | | | | | | | | | Merge pull request #25190 from willnet/fix-action-cable-guides | प्रथमेश Sonpatki | 2016-05-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | [ci skip]Fix wrong require path raising LoadError | willnet | 2016-05-29 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #25189 from xtian/patch-1 | प्रथमेश Sonpatki | 2016-05-29 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | ActionController::Parameters: Fix #dig doc code | Christian Wesselhoeft | 2016-05-29 | 1 | -5/+5 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #25188 from y-yagi/rename_enum_prefix_suffix | Kasper Timm Hansen | 2016-05-29 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | rename enum_prefix and enum_suffix options to _prefix and _suffix [ci skip] | yuuji.yaginuma | 2016-05-29 | 1 | -2/+3 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Fix more assertion counts. | Kasper Timm Hansen | 2016-05-28 | 1 | -2/+2 | |
* | | | | | | | | Fix assertion count after 69e1bb52. | Kasper Timm Hansen | 2016-05-28 | 1 | -2/+2 | |
* | | | | | | | | Merge pull request #25182 from rails/remove-public-files-for-api-apps | David Heinemeier Hansson | 2016-05-28 | 2 | -1/+18 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove public/ files for API apps | Prathamesh Sonpatki | 2016-05-28 | 2 | -1/+18 | |
* | | | | | | | | | Redirects are to urls, not paths | David Heinemeier Hansson | 2016-05-28 | 1 | -3/+3 | |
* | | | | | | | | | The first comment does not explain anything that the code doesnt and the seco... | David Heinemeier Hansson | 2016-05-28 | 1 | -2/+0 | |
* | | | | | | | | | Boil down custom Action Cable configuration to a single block | David Heinemeier Hansson | 2016-05-28 | 1 | -4/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #25177 from y-yagi/fix_class_name | प्रथमेश Sonpatki | 2016-05-28 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | fix incorrect class name [ci skip] | yuuji.yaginuma | 2016-05-28 | 2 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #25176 from kamipo/use_add_index_in_guides | Vipul A M | 2016-05-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use `add_index` instead of `execute` in guides [ci skip] | Ryuta Kamizono | 2016-05-28 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #25172 from imtayadeway/activejob/after-enqueue-doc | Vipul A M | 2016-05-27 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [ci skip] Reword doc for around_enqueue callback | Tim Wade | 2016-05-27 | 1 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #25171 from matkoniecz/cosmetic_updates | Vipul A M | 2016-05-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | cometic updates to security guide - fixes #25058 [ci skip] | Mateusz Konieczny | 2016-05-27 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #25160 from kamipo/remove_association_for_table | Rafael França | 2016-05-27 | 1 | -6/+0 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Remove unused `association_for_table` private method | Ryuta Kamizono | 2016-05-27 | 1 | -6/+0 | |
* | | | | | | | Merge pull request #25162 from willnet/fix-guides | प्रथमेश Sonpatki | 2016-05-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [ci skip] Fix ActionCable Guides | willnet | 2016-05-27 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #25164 from y-yagi/add_missing_as_option_to_deprecation_me... | Kasper Timm Hansen | 2016-05-27 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | add missing `as` to request kwargs of `ActionDispatch::IntegrationTest` | yuuji.yaginuma | 2016-05-27 | 1 | -2/+3 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #25157 from maclover7/jm-23930-add-tests | Kasper Timm Hansen | 2016-05-27 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Add test for `delegate_missing_to` where method doesn't exist | Jon Moss | 2016-05-26 | 1 | -0/+8 | |
* | | | | | | | Merge pull request #25158 from xhpwn/master | Arun Agrawal | 2016-05-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | |