aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 definition
| * Move `Workshop` class definitionJon Moss2016-05-302-18/+18
|/ | | | | We should define it only where we need it, not in the global abstract unit :grimacing:
* 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 `AssociationQueryHandler.value_for`
| * Reuse a result of `table.associated_table(column)` in ↵Ryuta Kamizono2016-05-281-2/+3
| | | | | | | | `AssociationQueryHandler.value_for`
* | Exists shouldn't error when used with `includes`Sean Griffin2016-05-304-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `exists?` does some hackery where it assumes that we can join onto anything that we passed to `eager_load` or `includes`, which doesn't work if we are joining onto a polymorphic association. Actually figuring out if we want to include something would require knowledge deep within the join dependency module, which is hard to pull up. The simplest solution is just to pass a flag down that says we're not actually going to try to eager load any of the data. It's not the solution I'd like, but that code really needs to be untangled before we can do much with it. This is another attempt at 6d5b1fd which should address the concerns that led to reverting it in 4ecabed.
* | Merge pull request #25194 from vipulnsward/use-cipherKasper Timm Hansen2016-05-301-1/+1
|\ \ | | | | | | use OpenSSL::Cipher instead of deprecated OpenSSL::Cipher::Cipher
| * | use OpenSSL::Cipher instead of deprecated OpenSSL::Cipher::Cipher for cipher ↵Vipul A M2016-05-291-1/+1
| | | | | | | | | | | | | | | | | | creation. Based on https://github.com/rails/rails/pull/25192#discussion_r65018222 and http://ruby-doc.org/stdlib-1.9.3/libdoc/openssl/rdoc/OpenSSL/Cipher/Cipher.html
* | | Ensure that instances of `ActiveModel::Errors` can be marshalledSean Griffin2016-05-302-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now use default procs inside of the errors object, which gets included by default when marshaling anything that includes `ActiveModel::Validations`. This means that Active Record objects cannot be marshalled. We strip and apply the default proc ourselves. This will ensure the objects are YAML serializable as well, since YAML falls back to marshal implementations now. This is less important, however, as the errors aren't included when dumping Active Record objects. This commit does not include a changelog entry, as 5.0 is still in RC status at the time of writing, and 5.0.0 will not release with the bug this fixes. Fixes #25165
* | | Merge pull request #25175 from kamipo/fix_migration_class_names_in_testsKasper Timm Hansen2016-05-306-6/+6
|\ \ \ | | | | | | | | Fix migration class names in tests
| * | | Fix migration class names in testsRyuta Kamizono2016-05-286-6/+6
| | | |
* | | | Tiny document fixes [ci skip]Robin Dupret2016-05-302-2/+2
| |/ / |/| | | | | | | | | | | | | | Add a missing capital letter and avoid using absolute links to the API because they may refer to out-dated documentation on the Edge site.
* | | Merge pull request #22240 from resource11/resource11-patch-1Arthur Nogueira Neves2016-05-291-4/+4
|\ \ \ | | | | | | | | Requesting documentation update
| * | | Issue 22240: adds link to list of instance methods [ci skip]Kathleen McMahon2016-03-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update associations.rb Update associations.rb updates link to instance methods [ci skip]
* | | | Merge pull request #24965 from arthurnn/arthurnn/conn_apiArthur Nogueira Neves2016-05-297-37/+43
|\ \ \ \ | | | | | | | | | | Change some establish_connection logic
| * | | | Add to_hash to specificationArthur Neves2016-05-254-4/+7
| | | | |
| * | | | Remove `name` from `establish_connection`Arthur Neves2016-05-247-33/+32
| | | | | | | | | | | | | | | | | | | | | | | | | Instead of passing a separete name variable, we can make the resolver merge a name on the config, and use that before creating the Specification.
| * | | | Move establish_connection to handlerArthur Neves2016-05-243-14/+18
| | | | |
* | | | | Merge pull request #25184 from ↵David Heinemeier Hansson2016-05-2911-35/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/move-up-framework-initializers Move new default initializers into separate directory
| * | | | | Move new default initializers into separate directoryPrathamesh Sonpatki2016-05-2811-35/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - These initializers are new defaults for Rails 5 and newly generated apps do not need to change them. - Fixes #25181
* | | | | | Merge pull request #25190 from willnet/fix-action-cable-guidesप्रथमेश Sonpatki2016-05-291-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip]Fix wrong require path raising LoadError
| * | | | | | [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 code
| * | | | | | ActionController::Parameters: Fix #dig doc codeChristian Wesselhoeft2016-05-291-5/+5
|/ / / / / / | | | | | | | | | | | | This example code wasn't getting wrapped in a `<code>` tag due to incorrect indentation.
* | | | | | 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]
| * | | | | rename enum_prefix and enum_suffix options to _prefix and _suffix [ci skip]yuuji.yaginuma2016-05-291-2/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | `:enum_prefix` and `:enum_suffix` was changed to `:_prefix` and `:_suffix` in #20999.
* | | | | Fix more assertion counts.Kasper Timm Hansen2016-05-281-2/+2
| | | | | | | | | | | | | | | | | | | | Follow up to e45f388.
* | | | | Fix assertion count after 69e1bb52.Kasper Timm Hansen2016-05-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When changing the generated integration tests to assert redirects with an absolute path this redirection check in `assert_redirected_to` against the absolute response location would now pass: https://github.com/rails/rails/blob/af245aaf3a1c447752a1b5895adddc66e5f73c00/actionpack/lib/action_dispatch/testing/assertions/response.rb#L55 Thus we'd break early instead of hitting `assert_operator` and have 2 fewer assertions per `assert_redirected_to` as `assert_operator` is composed of 2 assertions internally: https://github.com/seattlerb/minitest/blob/4e146b1515b19a5c474e39c174b037510f6dbc6e/lib/minitest/assertions.rb#L254-L258 Deduct 2 assertions for 2 redirects taking the expected count down by 4 in total for the two failing tests.
* | | | | Merge pull request #25182 from rails/remove-public-files-for-api-appsDavid Heinemeier Hansson2016-05-282-1/+18
|\ \ \ \ \ | | | | | | | | | | | | Remove public/ files for API apps
| * | | | | Remove public/ files for API appsPrathamesh Sonpatki2016-05-282-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | - Fixes #25180
* | | | | | 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 ↵David Heinemeier Hansson2016-05-281-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | second is now irrelevant with the dedicated API mode
* | | | | | 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]
| * | | | 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]
| * | | | 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 callback
| * | | | [ci skip] Reword doc for around_enqueue callbackTim Wade2016-05-271-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | Taken literally, the documentation suggests that the callback gets called twice (before and after enqueueing). By wording it similarly to that of around_perform this confusion is avoided.
* | | | Merge pull request #25171 from matkoniecz/cosmetic_updatesVipul A M2016-05-271-1/+1
|\ \ \ \ | | | | | | | | | | cometic updates to security guide - fixes #25058 [ci skip]
| * | | | 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 method
| * | | Remove unused `association_for_table` private methodRyuta Kamizono2016-05-271-6/+0
| | | | | | | | | | | | | | | | `association_for_table` is unused since 50a8cdf.
* | | | Merge pull request #25162 from willnet/fix-guidesप्रथमेश Sonpatki2016-05-271-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] Fix ActionCable Guides
| * | | | [ci skip] Fix ActionCable Guideswillnet2016-05-271-1/+1
| |/ / / | | | | | | | | | | | | Default worker pool size was changed from 100 to 4 at #24376
* | | | Merge pull request #25164 from ↵Kasper Timm Hansen2016-05-271-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | y-yagi/add_missing_as_option_to_deprecation_message add missing `as` to request kwargs of `ActionDispatch::IntegrationTest`
| * | | | add missing `as` to request kwargs of `ActionDispatch::IntegrationTest`yuuji.yaginuma2016-05-271-2/+3
| |/ / / | | | | | | | | | | | | Follow up to #21671
* | | | 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 exist
| * | | Add test for `delegate_missing_to` where method doesn't existJon Moss2016-05-261-0/+8
| | | |
* | | | Merge pull request #25158 from xhpwn/masterArun Agrawal2016-05-271-1/+1
|\ \ \ \ | |/ / / |/| | | Bash markdown syntax
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 15:39:32 +0000