aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | Merge pull request #21809 from yui-knk/fix_doc_am_serializationSean Griffin2015-10-021-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Fix explanation of `ActiveModel::Serialization`
| * | | | | | | | | | | | | | | | [ci skip] Fix explanation of `ActiveModel::Serialization`yui-knk2015-10-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This explanation was change by https://github.com/rails/rails/commit/7a27de2b. This change reversed the including module (`ActiveModel::Serializers::JSON`) and the included module (`ActiveModel::Serialization`) by mistake.
* | | | | | | | | | | | | | | | | Merge pull request #21839 from andyatkinson/remove-unusued-scopesSean Griffin2015-10-023-10/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused scopes
| * | | | | | | | | | | | | | | | | Remove unused scopesAndy Atkinson2015-10-013-10/+0
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Build the `AttributeMutationTracker` lazilySean Griffin2015-10-022-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For reads, we never need to construct this object. The double `defined?` check is to avoid errors in tests
* | | | | | | | | | | | | | | | | | Merge pull request #20600 from ↵Andrew White2015-10-022-7/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtsmfm/xmlschema-should-display-more-than-6-digits TimeWithZone#xmlschema should be able to display more than 6 digits
| * | | | | | | | | | | | | | | | | | TimeWithZone#xmlschema should be able to display more than 6 digitsFumiaki MATSUSHIMA2015-09-302-7/+6
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #21539 from tgxworld/parameters_not_sanitizedSean Griffin2015-10-024-7/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix AC::Parameters not being sanitized for query methods.
| * | | | | | | | | | | | | | | | | | | Fix AC::Parameters not being sanitized for query methods.Guo Xiang Tan2015-10-024-7/+64
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | đź’ŁSean Griffin2015-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I misread this test in https://github.com/rails/rails/commit/1a693c79c32cba070256fdb7bd1990c3d07d554f
* | | | | | | | | | | | | | | | | | | Fix test failures on MySQLSean Griffin2015-10-023-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a few places where I missed a `create` vs `new` before_type_cast check, and the semantics of `reload` became wrong.
* | | | | | | | | | | | | | | | | | | Further encapsulate dirty checking on `Attribute`Sean Griffin2015-10-026-51/+99
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can skip the allocation of a full `AttributeSet` by changing the semantics of how we structure things. Instead of comparing two separate `AttributeSet` objects, and `Attribute` is now a singly linked list of every change that has happened to it. Since the attribute objects are immutable, to apply the changes we simply need to copy the head of the list. It's worth noting that this causes one subtle change in the behavior of AR. When a record is saved successfully, the `before_type_cast` version of everything will be what was sent to the database. I honestly think these semantics make more sense, as we could have just as easily had the DB do `RETURNING *` and updated the record with those if we had things like timestamps implemented at the DB layer. This brings our performance closer to 4.2, but we're still not quite there.
* | | | | | | | | | | | | | | | | | Merge pull request #21838 from jeremy/response-add-headerJeremy Daer2015-10-012-0/+79
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Response#add_header for adding to multi-valued headers like Vary
| * | | | | | | | | | | | | | | | | Response#add_header for adding to multi-valued headers like VaryJeremy Daer2015-10-012-0/+79
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #21836 from jeremy/no-nil-set-cookie-headersJeremy Daer2015-10-012-75/+96
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't set a nil Set-Cookie header when there aren't any cookies
| * | | | | | | | | | | | | | | | | Don't set a nil Set-Cookie header when there aren't any cookies. Omit the ↵Jeremy Daer2015-10-012-75/+96
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | header.
* | | | | | | | | | | | | | | | | Merge pull request #21757 from Gaurav2728/gaurav-adding_x_frame_testKasper Timm Hansen2015-10-011-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adding test for content type with default charset
| * | | | | | | | | | | | | | | | | adding test for content type with default charsetGaurav Sharma2015-10-021-1/+11
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * first test is for `default_charset` i.e `ActionDispatch::Response.default_charset = “utf-8”` * In below test we are passing `ActionDispatch::Response.default_charset = 'utf-16’` so name of the test is irrelevant — “read content type without charset”
* | | | | | | | | | | | | | | | | Merge pull request #20599 from aliaksandrb/regex_fix_for_mattr_accessorArthur Nogueira Neves2015-10-012-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regex fix for mattr_accessor validation
| * | | | | | | | | | | | | | | | | Regex fix for mattr_accessor validationAliaksandr Buhayeu2015-10-012-2/+16
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change ^ and $ operators to \A and \z to prevent code injection after the line breaks
* | | | | | | | | | | | | | | | | Merge pull request #21760 from repinel/refactor-as-callbacks-halt-configKasper Timm Hansen2015-10-019-36/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor AS::Callbacks halt config and fix the documentation
| * | | | | | | | | | | | | | | | | Refactor AS::Callbacks halt config and fix the documentationRoque Pinel2015-10-019-36/+38
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move from `AS::Callbacks::CallbackChain.halt_and_display_warning_on_return_false` to `AS::Callbacks.halt_and_display_warning_on_return_false` base on [this discussion](https://github.com/rails/rails/pull/21218#discussion_r39354580) Fix the documentation broken by 0a120a818d413c64ff9867125f0b03788fc306f8
* | | | | | | | | | | | | | | | | Merge pull request #21823 from prakashlaxkar/test_casesKasper Timm Hansen2015-10-011-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added test cases for checkbox_tag
| * | | | | | | | | | | | | | | | | Add test cases for checkbox_tagPrakash Laxkar2015-10-011-0/+12
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | make sure exceptions are marshalable when returning test resultsAaron Patterson2015-09-301-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this should fix the error where isolation tests raise an exception and we just get a marshal error
* | | | | | | | | | | | | | | | | Merge pull request #21821 from akshay-vishnoi/fix-test-casesKasper Timm Hansen2015-09-301-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test cases for text_field_tag
| * | | | | | | | | | | | | | | | | Add test case for text_field_tagAkshay Vishnoi2015-10-011-1/+7
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | only construct one request in an engineAaron Patterson2015-09-302-14/+17
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | run against edge sass to eliminate circular require warningsAaron Patterson2015-09-303-7/+11
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #20574 from repinel/fix-db-fixtures-loadYves Senn2015-09-308-14/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow fixtures YAML files to set the model class in the file itself Conflicts: activerecord/CHANGELOG.md
| * | | | | | | | | | | | | | | | Allow fixtures YAML files to set the model class in the file itselfRoque Pinel2015-09-119-12/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, `set_fixture_class` is only available using the `TestFixtures` concern and it is ignored for `rake db:fixtures:load`. Using the correct model class, it is possible for the fixture load to also load the associations from the YAML files (e.g., `:belongs_to` and `:has_many`).
* | | | | | | | | | | | | | | | | Merge pull request #21817 from jdantonio/clear-concurrent-ruby-warningsKasper Timm Hansen2015-09-303-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed concurrent-ruby warnings.
| * | | | | | | | | | | | | | | | | Fixed concurrent-ruby warnings.Jerry D'Antonio2015-09-293-6/+6
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumped version of concurrent-ruby to 1.0.0.pre3, which fixes all interpreter warnings.
* | | | | | | | | | | | | | | | | Bump concurrent-ruby to shush circular require warningJeremy Daer2015-09-291-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | call `default_middleware_stack` before merging stacksAaron Patterson2015-09-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `default_middleware_stack` seems to kick off the `on_load` calls that may mutate the middleware stack. We have to call that method before merging middleware stacks, otherwise the middleware stacks get mutated *after* the app middleware stack is built.
* | | | | | | | | | | | | | | | | Engines get different middleware than appsAaron Patterson2015-09-293-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We shouldn't merge the app middleware in to the config middleware for engines.
* | | | | | | | | | | | | | | | | Merge pull request #21794 from ↵Jeremy Daer2015-09-2911-191/+262
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jeremy/sprockets/move-asset-manifest-from-toplevel-to-config-subdir Eliminate overlapping `app/assets` load path
| * | | | | | | | | | | | | | | | | Eliminate overlapping `app/assets` load pathJeremy Daer2015-09-2911-191/+262
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move `app/assets/manifest.js` to `app/assets/config/manifest.js`. Avoid the suggestion that you can/should deep-link `stylesheets/foo`. * Pull in all toplevel stylesheets and JavaScripts, not just `application.js` and `.css`. Demonstrate how to use `link_directory` with a specified `.js`/`.css` type. * Fix RAILS_ENV handling in assets tests. * Shush warnings spam from third-party libs that distract from tests.
* | | | | | | | | | | | | | | | | Make app building threadsafeeileencodes2015-09-291-4/+8
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Stop modifying global variableseileencodes2015-09-293-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allocating a new middleware proxy in each application configuration and then merging the app specific config with the global config when the app is built.
* | | | | | | | | | | | | | | | | Merge pull request #21813 from prakashlaxkar/doc_changesRafael Mendonça França2015-09-296-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve readability of docs by using code tag [ci skip]
| * | | | | | | | | | | | | | | | | Improve readability of docs by using code tag [ci skip]Prakash Laxkar2015-09-296-6/+6
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #21816 from nburkley/has-many-documentationArthur Nogueira Neves2015-09-291-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Fix documentation for has_many dependant options.
| * | | | | | | | | | | | | | | | | Fix documentation for has_many dependant options.Niall Burkley2015-09-291-1/+4
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * A `has_many` dependant association accepts `[:destroy, :delete_all, :nullify, :restrict_with_error, :restrict_with_exception]` as options. Currently the documentation references `delete` instead of `delete_all` * Adds documentation for other options
* | | | | | | | | | | | | | | | | Merge pull request #21430 from kaspth/test-runner-fail-fastKasper Timm Hansen2015-09-295-6/+197
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add fail fast reporting to test runner.
| * | | | | | | | | | | | | | | | | Add fail fast to test runner.Kasper Timm Hansen2015-09-295-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing `--fail-fast` to the test runner will now abort the test run on the first failure. The run continues on any unexpected errors.
| * | | | | | | | | | | | | | | | | Add inline failure reporting to test runner.Kasper Timm Hansen2015-09-285-6/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any failures or errors will be reported inline during the run by default. Skipped tests will be reported if run in verbose mode. Any result is output with failure messages and a rerun snippet for that test. Rerun snippets won't be output after a run, unless `--defer-output` is passed.
* | | | | | | | | | | | | | | | | | Merge pull request #21661 from akshay-vishnoi/submit_tag_testsRafael Mendonça França2015-09-292-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix - Prevent adding of `data-disable-with` option twice in html.
| * | | | | | | | | | | | | | | | | | Fix - Prevent adding of `data-disable-with` option twice in html.Akshay Vishnoi2015-09-182-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier when `data-disable-with` option is added direclty as in options then ```ruby submit_tag("Save", { "data-disable-with" => "Processing..." }) # => <input type="submit" name="commit" value="Save" data-disable-with="Processing..." data-disable-with="Processing..." /> ``` Now when `data-disable-with` option is added direclty as in options then ```ruby submit_tag("Save", { "data-disable-with" => "Processing..." }) # => <input type="submit" name="commit" value="Save" data-disable-with="Processing..." /> ```
* | | | | | | | | | | | | | | | | | | Merge pull request #21811 from akihiro17/remove-unused-test-codeRafael Mendonça França2015-09-291-11/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove TestRouter#add_routes
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 02:42:34 +0000