aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge pull request #23746 from meinac/fix_ar_change_logEileen M. Uchitelle2016-02-171-3/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove accidentally duplicated change log title [ci skip]
| * | | | | | | | | | | Remove accidentally duplicated change log title [ci skip]Mehmet Emin İNAÇ2016-02-181-3/+0
|/ / / / / / / / / / /
* | | | | | | | | | | partially revert 69009f4473637a44ade26d954ef5ddea6ff903f2Aaron Patterson2016-02-171-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we need to continue setting the body on the request object because of Fiber based streaming templates. Fixes #23659
* | | | | | | | | | | Merge pull request #22365 from ↵Sean Griffin2016-02-177-6/+111
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phuibonhoa/phuibonhoa/polymorphic_where_multiple_types Fixed `where` for polymorphic associations when passed an array containing different types.
| * | | | | | | | | | Fixed `where` for polymorphic associations when passed an array containing ↵Philippe Huibonhoa2016-02-167-6/+111
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | different types. When passing in an array of different types of objects to `where`, it would only take into account the class of the first object in the array. PriceEstimate.where(estimate_of: [Treasure.find(1), Car.find(2)]) # => SELECT "price_estimates".* FROM "price_estimates" WHERE ("price_estimates"."estimate_of_type" = 'Treasure' AND "price_estimates"."estimate_of_id" IN (1, 2)) This is fixed to properly look for any records matching both type and id: PriceEstimate.where(estimate_of: [Treasure.find(1), Car.find(2)]) # => SELECT "price_estimates".* FROM "price_estimates" WHERE (("price_estimates"."estimate_of_type" = 'Treasure' AND "price_estimates"."estimate_of_id" = 1) OR ("price_estimates"."estimate_of_type" = 'Car' AND "price_estimates"."estimate_of_id" = 2))
* | | | | | | | | | Merge pull request #23570 from rthbound/addresses-23568Matthew Draper2016-02-182-8/+14
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | Addresses #23568, Incorrect error message with accepts_nested_attributes_for / has_many & has_one
| * | | | | | | | | Addresses #23568Ryan T. Hosford2016-02-092-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Corrects an incorrect exception message when using accepts_nested_attributes_for - Removes rescue/reraise behavior introduced in #19077 - Adds has_many & has_one, nested_attributes test case specifying the message that should be conveyed with an exception raised because one of the nested attributes provided is unknown
* | | | | | | | | | Merge pull request #23730 from y-yagi/fail_fast_when_test_errorAndrew White2016-02-174-5/+20
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | modify to `error` also abort when specify fail fast option
| * | | | | | | | | modify to `error` also abort when specify fail fast optionyuuji.yaginuma2016-02-174-5/+20
| | | | | | | | | |
* | | | | | | | | | Merge pull request #23732 from bquorning/actioncontroller-parameters-inspectYves Senn2016-02-173-2/+15
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Implement ActionController::Parameters#inspect
| * | | | | | | | | | Implement ActionController::Parameters#inspectBenjamin Quorning2016-02-173-2/+15
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that AC::Parameters is no longer a Hash, it shouldn't look like a hash.
* | | | | | | | | | Merge pull request #23662 from rthbound/adds-missing-digestor-nested-deps-testsYves Senn2016-02-172-0/+12
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | adds missing tests for Digestor#nested_dependencies
| * | | | | | | | | adds tests for Digestor#nested_dependenciesRyan T. Hosford2016-02-132-0/+12
| | | | | | | | | |
* | | | | | | | | | Merge pull request #23731 from y-yagi/remove_unused_methodKasper Timm Hansen2016-02-171-4/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | remove unused method
| * | | | | | | | | | remove unused methodyuuji.yaginuma2016-02-171-4/+0
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | `app_templates_dir` is unused since dc53fe9.
* | | | | | | | | | Merge pull request #23729 from maclover7/rm-unused-journeyRafael França2016-02-172-8/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove unused Journey code
| * | | | | | | | | | Remove unused Journey codeJon Moss2016-02-172-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `VERSION` shouldn't be there anymore since Journey is technically part of Action Dispatch now (and thus Action Pack, and follows the normal Rails versioning scheme) - `backwards.rb` was only in the file tree because early in the history or Journey (back in 2011!), it was moved from under the Rack namespace, to its own namespace, Journey! This file is no longer required, and is assigning constants that are no longer needed.
* | | | | | | | | | | Merge pull request #23727 from prathamesh-sonpatki/fix-error-message-for-orRafael França2016-02-172-0/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Show proper error message when a non-relation object is passed to AR::Relation#or
| * | | | | | | | | | | Show proper error message when a non-relation object is passed to ↵Prathamesh Sonpatki2016-02-172-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AR::Relation#or - Previously it used to show error message <"undefined method `limit_value' for {:title=>\"Rails\"}:Hash"> - Now it shows following error message. >> Post.where.not(name: 'DHH').or(name: 'Tenderlove') ArgumentError: You have passed Hash object to #or. Pass an ActiveRecord::Relation object instead. - Fixes #23714.
* | | | | | | | | | | | Merge pull request #23728 from ↵Rafael França2016-02-171-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/add-ac-changelong-in-relase-notes Add Action Cable CHANGELOG in release notes [ci skip]
| * | | | | | | | | | | Add Action Cable CHANGELOG in release notes [ci skip]Prathamesh Sonpatki2016-02-171-0/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #23726 from akshaymohite/fix-test-names-in-batches-testRafael França2016-02-171-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Fix semantics of test names for finish option in batches_test
| * | | | | | | | | | Fix semantics of test names for finish option in batches_testAkshay2016-02-171-2/+2
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The change was added in #23099
* | | | | | | | | | Fix typoRafael Mendonça França2016-02-171-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #23712 from ↵Rafael França2016-02-172-10/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf4/incorrect_to_accept_json_api_and_not_render_spec The JSON API media type should only work wih a JSON API handler
| * | | | | | | | | | The JSON API media type should only work wih a JSON API handlerBenjamin Fleischer2016-02-162-10/+3
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the media type 'application/vnd.api+json' is a spec, it is inappropriate to handle it with the JSON renderer. This PR removes support for a JSON API media type. I would recommend the media type be registered on its own as `jsonapi` when a jsonapi Renderer and deserializer (Http::Parameters::DEFAULT_PARSERS) are added. Is related to work in https://github.com/rails/rails/pull/21496
* | | | | | | | | | Merge pull request #23713 from collectiveidea/add-store-attributes-testRafael França2016-02-171-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Test parent local_stored_attributes isn't modified
| * | | | | | | | | | Test parent local_stored_attributes isn't modifiedDavid Genord II2016-02-161-0/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Saw the `merge!` and had to prove to myself that the parent model's local_stored_attributes was not being changed when stored_attributes is called on a child model. Proved to be working as expected but this test is probably still useful to keep around.
* | / / / / / / / / Fix code styleRafael Mendonça França2016-02-171-3/+4
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | This change was added in #23203 and it was not conforming our code style.
* | | | | | | | | adds --skip-listen to the application generator [closes #23590]Xavier Noria2016-02-176-13/+42
| | | | | | | | |
* | | | | | | | | Merge pull request #23661 from meinac/add_gzip_mime_typeRichard Schneeman2016-02-163-1/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | application/gzip added as default mime type into mime type list
| * | | | | | | | | application/gzip added as default mime type into mime type listMehmet Emin İNAÇ2016-02-133-1/+6
| | | | | | | | | |
* | | | | | | | | | Merge pull request #23705 from chi6rag/masterVipul A M2016-02-171-1/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ci skip] Updating edge rails guides to include `on_weekday?` on Date, Time and DateTime
| * | | | | | | | | | [ci skip] Updating edge rails guides to include `on_weekday?` on Date, Time ↵Chirag Aggarwal2016-02-171-1/+5
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and DateTime [ci skip] Adding `on_weekend?` method in edge rails guides
* | | | | | | | | | Merge pull request #23203 from vipulnsward/22979-show-tags-on-exceptionRichard Schneeman2016-02-163-12/+16
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | WIP: Errors in logs should show log tags as well.
| * | | | | | | | | WIP: Errors in logs should show log tags as well.Vipul A M2016-02-123-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed formatted_code_for to return array of logs to be tagged for each line - Changed some render tests to match new behaviour of return Fixes #22979
* | | | | | | | | | Merge pull request #23630 from akshaymohite/correct-test-name-api-onlyYves Senn2016-02-161-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Correct config option from only_api to api_only in test
| * | | | | | | | | | Correct config option from only_api to api_only in testAkshay2016-02-121-1/+1
| |/ / / / / / / / /
* | | | | | | | | | fix class name typo.Yves Senn2016-02-162-3/+3
| | | | | | | | | |
* | | | | | | | | | Merge pull request #23614 from georgemillo/foreign_keyYves Senn2016-02-163-2/+23
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let t.foreign_key use the same `to_table` twice Conflicts: activerecord/CHANGELOG.md
| * | | | | | | | | | Let t.foreign_key use the same `to_table` twiceGeorge Millo2016-02-153-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if you used `t.foreign_key` twice within the same `create_table` block using the same `to_table`, all statements except the final one would fail silently. For example, the following code: def change create_table :flights do |t| t.integer :from_id, index: true, null: false t.integer :to_id, index: true, null: false t.foreign_key :airports, column: :from_id t.foreign_key :airports, column: :to_id end end Would only create one foreign key, on the column `from_id`. This commit allows multiple foreign keys to the same table to be created within one `create_table` block.
* | | | | | | | | | | reset `ActionMailer::Base.deliveries` in `ActionDispatch::IntegrationTest`.Yves Senn2016-02-165-4/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever you are sending emails in integration tests using the `:test` delivery method you need to make sure that `ActionMailer::Base.deliveries` is reset after every test. This piece of boilerplate code is present in all my applications that send emails. Let's have `ActionDispatch::IntegrationTest` reset the deliveries automatically.
* | | | | | | | | | | Merge pull request #23692 from abhishekjain16/docsYves Senn2016-02-163-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use a URL instead of an URL everywhere
| * | | | | | | | | | | Use a URL instead of an URL everywhereAbhishek Jain2016-02-153-3/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #23706 from vipulnsward/add-changelog-for-regressionYves Senn2016-02-161-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing CHANGELOG for regression fix in #18155 which fixes #13387
| * | | | | | | | | | | | Add missing CHANGELOG for regression fix in #18155 which fixes #13387Vipul A M2016-02-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | Remove unused test controller actionAndrew White2016-02-161-5/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #22828 from ma2gedev/should-escape-cookieAndrew White2016-02-162-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | A cookie value is incorrect if value contains an escapable string in Rails 5 ActionController::TestCase
| * | | | | | | | | | | | Join values using '; ' as per RFC specAndrew White2016-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple cookie values should be separated by '; ' according to RFC 6265, section 5.4.4[1]. [1]: https://tools.ietf.org/html/rfc6265#section-5.4
| * | | | | | | | | | | | Add require and move escape to private methodAndrew White2016-02-161-1/+6
| | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 09:13:54 +0000