aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
* | | | Merge pull request #21778 from amitsuroliya/correct_argument_errorAbdelkader Boudih2015-09-261-1/+1
|\ \ \ \ | |/ / / |/| | | Correcting `ActiveRecord::DangerousAttributeError` error message [ci …
| * | | Correcting `ActiveRecord::DangerousAttributeError` error message [ci skip]amitkumarsuroliya2015-09-261-1/+1
|/ / /
* | | Merge pull request #21777 from aditya-kapoor/minor-time-fixAbdelkader Boudih2015-09-261-1/+1
|\ \ \ | |_|/ |/| | minor typo fix [ci skip]
| * | minor typo fix [ci skip]Aditya Kapoor2015-09-261-1/+1
|/ /
* | Merge pull request #21775 from amitsuroliya/fix_column_alias_forRafael Mendonça França2015-09-261-1/+0
|\ \ | | | | | | `column_alias_for` method is no more supporting *keys [ci skip]
| * | `column_alias_for` method is no more supporting *keys [ci skip]amitkumarsuroliya2015-09-261-1/+0
| | |
* | | Merge pull request #21431 from ojab/masterRafael Mendonça França2015-09-262-1/+29
|\ \ \ | | | | | | | | Handle nested fields_for by adding indexes to record_name
| * | | Handle nested fields_for by adding indexes to record_nameojab2015-08-302-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of the form with nested fields_for, i. e. <%= form_for :foos, url: root_path do |f| %> <% @foos.each do |foo| %> <%= f.fields_for 'foo[]', foo do |f2| %> <%= f2.text_field :id %> <% foo.bars.each do |bar| %> <%= f2.fields_for 'bar[]', bar do |b| %> <%= b.text_field :id %> <% end %> <% end %> <% end %> <% end %> <%= f.submit %> <% end %> rails doesn't add index for 'foo' in the inner fields_for block, so field names in the outer fields_for looks like "foos[foo][#{foo_index}][id]" and in the inner "foos[foo[]][bar][#{bar_index}][id]". Submitting of such form leads to an error like: >ActionController::BadRequest (Invalid request parameters: expected Array >(got Rack::QueryParser::Params) for param `foo'): This commit adds indexes for the foos in the inner blocks, so field names become "foos[foo][#{foo_index}][bar][#{bar_index}][id]" and submitting of such form works fine as expected. Fixes #15332
* | | | Merge pull request #21774 from amitsuroliya/fix_predicate_builderRafael Mendonça França2015-09-261-1/+1
|\ \ \ \ | |_|/ / |/| | | Fix `ActiveRecord::PredicateBuilder` docs. as `register_handler` no m…
| * | | Fix `ActiveRecord::PredicateBuilder` docs. as `register_handler` no more ↵amitkumarsuroliya2015-09-261-1/+1
|/ / / | | | | | | | | | ClassMethod, Since commit https://github.com/rails/rails/commit/a3936bbe21f4bff8247f890cacfd0fc882921003 [ci skip]
* | | Merge pull request #19425 from wvengen/feature/activejob-priority-masterRafael Mendonça França2015-09-2511-6/+132
|\ \ \ | | | | | | | | Add job priorities to ActiveJob
| * | | Add job priorities to ActiveJobwvengen2015-09-1711-6/+132
| | | |
* | | | Merge pull request #18303 from maurogeorge/collection_radio_buttons_hidden_fieldRafael Mendonça França2015-09-257-36/+103
|\ \ \ \ | | | | | | | | | | Add a hidden field on the collection_radio_buttons
| * | | | Regression test on CollectionCheckBoxes to accept `include_hidden`Mauro George2015-09-241-0/+7
| | | | | | | | | | | | | | | | | | | | as string
| * | | | Add a hidden field on the collection_radio_buttonsMauro George2015-09-247-36/+96
| | | | | | | | | | | | | | | | | | | | | | | | | This will avoid a error be raised when the only input on the form is the `collection_radio_buttons`.
* | | | | Merge pull request #21767 from ronakjangir47/missing_transform_values_testRafael Mendonça França2015-09-251-0/+12
|\ \ \ \ \ | | | | | | | | | | | | Added missing tests for transform_values! which returns Enumerator