aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Ensure hashes can be passed to attributes using `composed_of`Sean Griffin2016-05-314-5/+21
| |/ / / / / |/| | | | |
* | | | | | Bump jbuilder dependency to version 2.5.0 for compatibility fixesDavid Heinemeier Hansson2016-05-311-1/+1
|/ / / / /
* | | | | Merge pull request #25206 from maclover7/jm-ap-testsRafael França2016-05-312-18/+18
|\ \ \ \ \
| * | | | | Move `Workshop` class definitionJon Moss2016-05-302-18/+18
|/ / / / /
* | | | | Merge pull request #25179 from kamipo/reuse_result_of_associated_tableSean Griffin2016-05-301-2/+3
|\ \ \ \ \
| * | | | | Reuse a result of `table.associated_table(column)` in `AssociationQueryHandle...Ryuta Kamizono2016-05-281-2/+3
* | | | | | Exists shouldn't error when used with `includes`Sean Griffin2016-05-304-11/+9
* | | | | | Merge pull request #25194 from vipulnsward/use-cipherKasper Timm Hansen2016-05-301-1/+1
|\ \ \ \ \ \
| * | | | | | use OpenSSL::Cipher instead of deprecated OpenSSL::Cipher::Cipher for cipher ...Vipul A M2016-05-291-1/+1
* | | | | | | Ensure that instances of `ActiveModel::Errors` can be marshalledSean Griffin2016-05-302-2/+32
* | | | | | | Merge pull request #25175 from kamipo/fix_migration_class_names_in_testsKasper Timm Hansen2016-05-306-6/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix migration class names in testsRyuta Kamizono2016-05-286-6/+6
* | | | | | | Tiny document fixes [ci skip]Robin Dupret2016-05-302-2/+2
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #22240 from resource11/resource11-patch-1Arthur Nogueira Neves2016-05-291-4/+4
|\ \ \ \ \ \
| * | | | | | Issue 22240: adds link to list of instance methods [ci skip]Kathleen McMahon2016-03-181-4/+4
* | | | | | | Merge pull request #24965 from arthurnn/arthurnn/conn_apiArthur Nogueira Neves2016-05-297-37/+43
|\ \ \ \ \ \ \
| * | | | | | | Add to_hash to specificationArthur Neves2016-05-254-4/+7
| * | | | | | | Remove `name` from `establish_connection`Arthur Neves2016-05-247-33/+32
| * | | | | | | Move establish_connection to handlerArthur Neves2016-05-243-14/+18
* | | | | | | | Merge pull request #25184 from prathamesh-sonpatki/move-up-framework-initiali...David Heinemeier Hansson2016-05-2911-35/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Move new default initializers into separate directoryPrathamesh Sonpatki2016-05-2811-35/+37
* | | | | | | | | Merge pull request #25190 from willnet/fix-action-cable-guidesप्रथमेश Sonpatki2016-05-291-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip]Fix wrong require path raising LoadErrorwillnet2016-05-291-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #25189 from xtian/patch-1प्रथमेश Sonpatki2016-05-291-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ActionController::Parameters: Fix #dig doc codeChristian Wesselhoeft2016-05-291-5/+5
|/ / / / / / / / /
* | | | | | | | | Merge pull request #25188 from y-yagi/rename_enum_prefix_suffixKasper Timm Hansen2016-05-291-2/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | rename enum_prefix and enum_suffix options to _prefix and _suffix [ci skip]yuuji.yaginuma2016-05-291-2/+3
|/ / / / / / / /
* | | | | | | | Fix more assertion counts.Kasper Timm Hansen2016-05-281-2/+2
* | | | | | | | Fix assertion count after 69e1bb52.Kasper Timm Hansen2016-05-281-2/+2
* | | | | | | | Merge pull request #25182 from rails/remove-public-files-for-api-appsDavid Heinemeier Hansson2016-05-282-1/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove public/ files for API appsPrathamesh Sonpatki2016-05-282-1/+18
* | | | | | | | | Redirects are to urls, not pathsDavid Heinemeier Hansson2016-05-281-3/+3
* | | | | | | | | The first comment does not explain anything that the code doesnt and the seco...David Heinemeier Hansson2016-05-281-2/+0
* | | | | | | | | Boil down custom Action Cable configuration to a single blockDavid Heinemeier Hansson2016-05-281-4/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #25177 from y-yagi/fix_class_nameप्रथमेश Sonpatki2016-05-282-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | fix incorrect class name [ci skip]yuuji.yaginuma2016-05-282-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #25176 from kamipo/use_add_index_in_guidesVipul A M2016-05-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use `add_index` instead of `execute` in guides [ci skip]Ryuta Kamizono2016-05-281-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #25172 from imtayadeway/activejob/after-enqueue-docVipul A M2016-05-271-2/+2
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Reword doc for around_enqueue callbackTim Wade2016-05-271-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #25171 from matkoniecz/cosmetic_updatesVipul A M2016-05-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | cometic updates to security guide - fixes #25058 [ci skip]Mateusz Konieczny2016-05-271-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #25160 from kamipo/remove_association_for_tableRafael França2016-05-271-6/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove unused `association_for_table` private methodRyuta Kamizono2016-05-271-6/+0
* | | | | | | Merge pull request #25162 from willnet/fix-guidesप्रथमेश Sonpatki2016-05-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Fix ActionCable Guideswillnet2016-05-271-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #25164 from y-yagi/add_missing_as_option_to_deprecation_me...Kasper Timm Hansen2016-05-271-2/+3
|\ \ \ \ \ \ \
| * | | | | | | add missing `as` to request kwargs of `ActionDispatch::IntegrationTest`yuuji.yaginuma2016-05-271-2/+3
| |/ / / / / /
* | | | | | | Merge pull request #25157 from maclover7/jm-23930-add-testsKasper Timm Hansen2016-05-271-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add test for `delegate_missing_to` where method doesn't existJon Moss2016-05-261-0/+8