aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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
| * | | | | Remove TestRouter#add_routesakihiro172015-09-291-11/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Now, we use the mapper to build the routing table related to https://github.com/rails/rails/commit/703275ba70efbefb3358052b6ba750443eff1a28
* | | | | Merge pull request #21810 from akshay-vishnoi/form-tag-testsRafael Mendonça França2015-09-291-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix names of test cases
| * | | | Fix names of test casesAkshay Vishnoi2015-09-291-3/+3
|/ / / /
* | | | Merge pull request #21807 from ronakjangir47/fix_formatted_offset_docsRafael Mendonça França2015-09-293-3/+10
|\ \ \ \ | | | | | | | | | | Update docs for `formatted_offset`
| * | | | Update docs for `formatted_offset` Ronak Jangir2015-09-293-3/+10
| | | | | | | | | | | | | | | Output of `formatted_offset` is depends on input so it’s not always in +HH:MM format. Possible outputs are “+5:30”, “+530” or provided alternate UTC string [ci skip]
* | | | | remove useless methodAaron Patterson2015-09-281-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | the caller of `handle_conditional_get!` checks the committed state of the response, so we don't need to in the subclass.
* | | | | Separate `dup` from `deep_dup` in the attributes hashSean Griffin2015-09-285-6/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm looking to move towards a tree-like structure for dirty checking that involves an attribute holding onto the attribute that it was created from. This means that `changed?` can be fully encapsulated on that object. Since the objects are immutable, in `changes_applied`, we can simply perform a shallow dup, instead of a deep one. I'm not sure if that will actually end up in a performance boost, but I'd like to semantically separate these concepts regardless
* | | | | Inline `Attribute#original_value`Sean Griffin2015-09-281-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The external uses of this method have been removed, and I'd like to internally re-use that name, as I'm planning to encapsulate `changed?` into the attribute object itself.
* | | | | Merge pull request #21800 from ↵Rafael Mendonça França2015-09-281-2/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Gaurav2728/no_more_class_methods_for_JoinDependency no more class methods for JoinDependency [ci skip]
| * | | | no more class methods for JoinDependency [ci skip]Gaurav Sharma2015-09-291-2/+1
| | | | | | | | | | | | | | | `ActiveRecord::Associations::JoinDependency` now it’s own class` and `ActiveRecord::Associations::ThroughAssociationScope` doesn’t exists
* | | | | Merge pull request #21782 from ronakjangir47/transform_values_docsRafael Mendonça França2015-09-282-8/+17
|\ \ \ \ \ | | | | | | | | | | | | Updated docs for transform_keys & transform_values
| * | | | | Updated docs for transform_values [ci skip]Ronak Jangir2015-09-281-3/+8
| | | | | |
| * | | | | Updated docs for transform_keys [ci skip]Ronak Jangir2015-09-281-5/+9
| | | | | |
* | | | | | Speed up `Hash#transform_values` when emptySean Griffin2015-09-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're calling this function on an empty hash as part of copying the attribute set during dirty checking initialization. The new structure caused a performance regression on loading records from the database. This causes `User.all.to_a` to perform about 10% faster w/ 10k records. Calculating ------------------------------------- User.all - master 9.000 i/100ms User.all - sg-fix-ar-regression 8.000 i/100ms ------------------------------------------------- User.all - master 81.236 (± 7.4%) i/s - 405.000 User.all - sg-fix-ar-regression 89.716 (± 7.8%) i/s - 448.000
* | | | | | Merge pull request #21797 from dv/docs-rewording-in-database-configure-guideKasper Timm Hansen2015-09-281-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make fuzzy sentence more clear
| * | | | | | Make fuzzy sentence more clearDavid Verhasselt2015-09-281-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #21789 from y-yagi/fix_warning_in_minitest_pluginKasper Timm Hansen2015-09-281-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | check if @rake_patterns is defined
| * | | | | check if @rake_patterns is definedyuuji.yaginuma2015-09-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the following warning. ``` railties/lib/rails/test_unit/minitest_plugin.rb:45: warning: instance variable @rake_patterns not initialize ```
* | | | | | Merge pull request #21793 from amitsuroliya/minor_doc_changesArthur Nogueira Neves2015-09-272-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix minor docs [ci skip]
| * | | | | | Fix minor docs [ci skip] amitkumarsuroliya2015-09-282-2/+2
| | | | | | |
* | | | | | | Merge pull request #21783 from amitsuroliya/record_not_foundRafael Mendonça França2015-09-281-7/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix `ActiveRecord::RecordNotFound` error message with custom primary …
| * | | | | | | Fix `ActiveRecord::RecordNotFound` error message with custom primary key [ci ↵amitkumarsuroliya2015-09-261-7/+7
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | skip]
* | | | | | | Merge pull request #21780 from yui-knk/fix_ar_sanitize_docRafael Mendonça França2015-09-281-19/+56
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | [ci skip] Update docs of `AR::Sanitization`
| * | | | | | [ci skip] Update docs of `AR::Sanitization`yui-knk2015-09-261-19/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add % style prepared statement and string examples for `sanitize_sql_for_conditions` * add array and string examples for `sanitize_sql_for_assignment` * add examples for `sanitize_sql_like` * add % style prepared statement example for `sanitize_sql_array` * align spaces of exampl code
* | | | | | | Merge pull request #21790 from yui-knk/fix_doc_date_fieldRafael Mendonça França2015-09-281-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Fix which method `FormHelper#date_field` try to call
| * | | | | | | [ci skip] Fix which method `FormHelper#date_field` try to callyui-knk2015-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this method was implemented (https://github.com/rails/rails/pull/5016/files), `to_date` is called. But this behavior was chagned refactoring (https://github.com/rails/rails/pull/6452/files). In the first commit, there were not test which asserts `to_date` is called. I think trying `to_date` is more useful than trying `strftime`, because we can write `"2015-01-01".to_date`. But first fix comments to match actual behavior.
* | | | | | | | Merge pull request #21785 from vngrs/minor_doc_fixSean Griffin2015-09-271-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | minor doc fix [ci skip]
| * | | | | | | | minor doc fix [ci skip]Mehmet Emin İNAÇ2015-09-271-3/+3
| | | | | | | | |
* | | | | | | | | Fix test that was failing because of typoeileencodes2015-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Here `app` needed to be `get` because we're getting a route. This fixes the typo so the test passes.
* | | | | | | | | Merge pull request #21776 from aditya-kapoor/add-missing-tests-infoEileen M. Uchitelle2015-09-271-0/+12
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Add missing routing tests for info controller
| * | | | | | | | Add missing routing tests for info controllerAditya Kapoor2015-09-271-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vaguely related to #21605 where I proposed to remove index route since it was redirecting to the 'routes' action, but this was kept so I thought it made sense to add some tests regarding this.
* | | | | | | | | Merge pull request #21787 from ronakjangir47/deprecate_const_definedKasper Timm Hansen2015-09-271-1/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Added test case for deprecation of Mime.const_defined? and removed use of it
| * | | | | | | | Added test case for deprecation of Mime.const_defined? and removed use of it.Ronak Jangir2015-09-271-1/+5
| |/ / / / / / /
* | | | | | | | Merge pull request #21788 from amitsuroliya/doc_fixesXavier Noria2015-09-271-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix proper fonts in `change_column_null` method docs. [ci skip]
| * | | | | | | Fix proper fonts in `change_column_null` method docs. [ci skip]amitkumarsuroliya2015-09-271-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #21784 from yui-knk/fix_reademe_railsGodfrey Chan2015-09-261-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [ci skip] Add `Active Model` to a list of independently used modules.
| * | | | | | [ci skip] Add `Active Model` to a list of independently used modules.yui-knk2015-09-271-1/+1
|/ / / / / /
* | | | | | Merge pull request #21781 from ronakjangir47/partial_caching_testKasper Timm Hansen2015-09-261-0/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added test cases where collection partial cached & rendered with different keys
| * | | | | | Added test cases where collection partial cached for different key and ↵Ronak Jangir2015-09-261-0/+10
| | |_|/ / / | |/| | | | | | | | | | | | | | | | rendered for different key
* | | | | | Fix regression in inverse_of on through associationseileencodes2015-09-266-14/+39
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `inverse_of` on through associations was accidently removed/caused to stop working in commit f8d2899 which was part of a refactoring on `ThroughReflection`. To fix we moved `inverse_of` and `check_validity_of_inverse!` to the `AbstractReflection` so it's available to the `ThroughReflection` without having to dup any methods. We then need to delegate `inverse_name` method in `ThroughReflection`. `inverse_name` can't be moved to `AbstractReflection` without moving methods that set the instance variable `@automatic_inverse_of`. This adds a test that ensures that `inverse_of` on a `ThroughReflection` returns the correct class name, and the correct record for the inverse relationship. Fixes #21692
* | | | | Merge pull request #21779 from amitsuroliya/typo_fixClaudio B.2015-09-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo in configuration test descritive > descriptive [ci skip]
| * | | | | Fix typo in configuration test descritive > descriptive [ci skip]amitkumarsuroliya2015-09-261-1/+1
| | | | | |