aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19401 from jonatack/patch-3Yves Senn2015-03-191-35/+38
|\ | | | | Active Record changelog pass [skip ci]
| * Active Record changelog pass [skip ci]Jon Atack2015-03-191-35/+38
| |
* | Merge pull request #19403 from akshay-vishnoi/docsAbdelkader Boudih2015-03-191-1/+1
|\ \ | | | | | | [ci skip] use true as value rather than symbol
| * | [ci skip] use true as value rather than symbolAkshay Vishnoi2015-03-191-1/+1
| | |
* | | Merge pull request #19400 from jamesbowles/patch-1Kasper Timm Hansen2015-03-191-1/+1
|\ \ \ | |_|/ |/| | [skip ci] Fixed typo in asset pipeline documentation
| * | [skip ci] Fixed typoJames2015-03-191-1/+1
|/ /
* | Merge pull request #19398 from akshay-vishnoi/docsClaudio B.2015-03-181-1/+1
|\| | | | | [ci skip] use false as value rather than symbol
| * [ci skip] use false as value rather than symbolAkshay Vishnoi2015-03-191-1/+1
|/
* Merge pull request #19391 from crackofdusk/docs_binstubsYves Senn2015-03-181-9/+9
|\ | | | | Change commands in the Getting Started guide to use scripts in bin/ [ci skip]
| * Change commands in the Getting Started guide to use scripts in bin/Dimiter Petrov2015-03-181-9/+9
|/ | | | [ci skip]
* Improve test for leaky scope chaineileencodes2015-03-181-1/+7
| | | | | | | | | | | | | | | | This is a better test for 51660f0. It is testing that the SQL is the same before and after the previously leaky scope is called. Before if `hotel.drink_designers` was called first then `hotel.recipes` would incorrectly get the scope applied. We want to be sure that the polymorphic hm:t association is not leaking into or affecting the SQL for the hm:t association on `Hotel`. The reason I couldn't do this before was because there was an issue with the SQL getting cached and wanted to resolve that later and then fix the test to be better. Because of the caching, this test requires that `Hotel.reflect_on_association(:recipes).clear_association_scope_cache` be called after the first call to `hotel.recipes` to clear the assocation scope chain and not interfere with the rest of the test.
* Add `clear_association_scope_cache` methodeileencodes2015-03-181-0/+15
| | | | | | | | | | | | | In the tests if I were to call `post.categorizations.to_a` and then later call `post.categorizations.to_a` expecting to have different results the 2 queries would be the same because of the caching involved in `@association_scope_cache`. The chain gets cached and the queries will be the same even if they are not supposed to be (i.e. testing an order dependent scoping issue). I found this issue because I was working on a bug with cached scoped in hm:t and hm:t polymorphic relationships but `capture_sql` was outputting the wrong SQL to write a good test.
* Merge pull request #19240 from yui-knk/refactor/guide_rbYves Senn2015-03-181-45/+0
|\ | | | | | | | | | | | | Remove gem check in guides/rails_guides.rb Conflicts: guides/rails_guides.rb
| * Remove gem check in guides/rails_guides.rbyui-knk2015-03-071-45/+0
| | | | | | | | | | Now rails/Gemfile includes nokogiri and redcarpet, so remove gem check from guides/rails_guides.rb
* | Remove additional handling of boolean attributes on button to helperCarlos Antonio da Silva2015-03-181-30/+0
| | | | | | | | | | | | | | | | This logic was just doing duplicated work, since the button_to helper relies on tag/content_tag to generate the button html, which already handles all boolean attributes it knows about. The code dates back to 2005: 43c470fae468ef63e0d5c3dc1e202925685fd47b.
* | Merge pull request #19348 from Empact/null-scopeYves Senn2015-03-183-2/+19
|\ \ | | | | | | | | | | | | | | | | | | Reuse the CollectionAssociation#reader proxy cache if the foreign key is present from the start. Conflicts: activerecord/CHANGELOG.md
| * | Reuse the CollectionAssociation#reader proxy cache if the foreign key is ↵Ben Woosley2015-03-153-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | present from the start. When a new record has the necessary information prior to save, we can avoid busting the cache. We could simply clear the @proxy on #reset or #reset_scope, but that would clear the cache more often than necessary.
* | | Merge pull request #19383 from mechanicles/use-consistent-exampleYves Senn2015-03-181-5/+5
|\ \ \ | | | | | | | | Make example code consistent for better understanding. [ci skip]
| * | | - Make example code consistent for better understanding. [ci skip]Santosh Wadghule2015-03-181-5/+5
| | | |
* | | | Merge pull request #19382 from leishman/patch-1Yves Senn2015-03-181-1/+1
|\ \ \ \ | | | | | | | | | | Update old link in pessimistic.rb comments [ci skip]
| * | | | Update old link in pessimistic.rb commentsAlexander Leishman2015-03-181-1/+1
|/ / / / | | | | | | | | Update link in comments to point to latest MySQL production version documentation. See here for reference: http://dev.mysql.com/doc/refman/5.0/en/choosing-version.html
* | | | Merge pull request #19381 from Empact/null-relationYves Senn2015-03-181-2/+2
|\ \ \ \ | |/ / / |/| | | Fix NullRelation.update_all and .exists? signature to match the same on Relation
| * | | Fix NullRelation.update_all and .exists? signature to match the same on RelationBen Woosley2015-03-181-2/+2
|/ / /
* | | Merge pull request #19380 from mechanicles/fix-wrong-model-nameAbdelkader Boudih2015-03-181-1/+1
|\ \ \ | | | | | | | | Fix wrong model name for 'Articles', It should be 'Article' [ci skip]
| * | | Fix wrong model name for 'Articles', It should be 'Article' [ci skip]Santosh Wadghule2015-03-181-1/+1
|/ / / | | | | | | | | | - Also changed 'a' to 'an' for 'Article' word.
* | | Merge pull request #19351 from reist/xml_documentRafael Mendonça França2015-03-182-1/+18
|\ \ \ | | | | | | | | Compare content_type with Mime::XML instead of regexp
| * | | Compare content_type with Mime::XML instead of regexpBoris Peterbarg2015-03-162-1/+18
| |/ / | | | | | | | | | | | | Regexp is broken for both content types including charsets and for integration tests, where the content_type is a Mime::Type and not String
* | | Merge pull request #19296 from Wildebeest/fix-race-ttlRafael Mendonça França2015-03-172-10/+22
|\ \ \ | | | | | | | | Skip the `:race_condition_ttl` branch if the option is 0 or nil.
| * | | Skip the `:race_condition_ttl` branch if the option is 0 or nil. This fixes ↵Matt Wilde2015-03-112-10/+22
| | | | | | | | | | | | | | | | an issue with the redis cache, where this code will sometimes throw an error out of SETEX when passing 0 as the `expires_at`.
* | | | Merge pull request #19347 from rywall/dump-schemas-configYves Senn2015-03-175-7/+69
|\ \ \ \ | | | | | | | | | | Add config.active_record.dump_schemas.
| * | | | Add config.active_record.dump_schemas.Ryan Wallace2015-03-175-7/+69
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes db:structure:dump when using schema_search_path and PostgreSQL extensions. Closes #17157.
* | | | Merge pull request #19376 from Empact/has-includeRafael Mendonça França2015-03-171-1/+1
|\ \ \ \ | | | | | | | | | | Drop `references_eager_loaded_tables?` test from `has_include?`
| * | | | Drop `references_eager_loaded_tables?` test from `has_include?`Ben Woosley2015-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is redundant with tests in `eager_loading?`, but for the difference between `includes_values.present?` and `includes_values.any?`, which is a difference without a distinction because `false` has no meaning for `includes`.
* | | | | Merge pull request #19373 from artofhuman/fix_deprecation_warns_in_testsYves Senn2015-03-171-8/+8
|\ \ \ \ \ | |/ / / / |/| | | | Fix deprecation warning in rails_info_controller tests
| * | | | Fix deprecation warning in rails_info_controller testsSemyon Pupkov2015-03-171-8/+8
|/ / / / | | | | | | | | | | | | Use keyword arguments in request methods
* | | | Merge pull request #19368 from JuanitoFatas/fix/unused-var-in-testArthur Nogueira Neves2015-03-161-1/+1
|\ \ \ \ | | | | | | | | | | Remove unused variable in activerecord reflection_test.
| * | | | Remove unused variable in activerecord reflection_test.Juanito Fatas2015-03-171-1/+1
|/ / / /
* | | | Merge pull request #19363 from keepcosmos/reflection-doc-fixAbdelkader Boudih2015-03-171-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] reflection doc fix about hierarchy
| * | | | reflection doc fix about hierarchykeepcosmos2015-03-171-1/+1
|/ / / /
* | | | Merge pull request #19359 from yahonda/mysql_subclientRafael Mendonça França2015-03-161-1/+3
|\ \ \ \ | | | | | | | | | | Materialize subqueries by adding `DISTINCT` to suport MySQL 5.7.6 and later
| * | | | Materialize subqueries by adding `DISTINCT`Yasuo Honda2015-03-161-1/+3
| | | | | | | | | | | | | | | | | | | | to support MySQL 5.7.6 `optimizer_switch='derived_merge=on'`
* | | | | Merge pull request #19282 from ↵Rafael Mendonça França2015-03-1653-89/+143
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | brandonweiss/better-name-for-transactional-fixtures Renaming transactional fixtures to transactional tests
| * | | | | Closes rails/rails#18864: Renaming transactional fixtures to transactional testsBrandon Weiss2015-03-1653-89/+143
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I’m renaming all instances of `use_transcational_fixtures` to `use_transactional_tests` and “transactional fixtures” to “transactional tests”. I’m deprecating `use_transactional_fixtures=`. So anyone who is explicitly setting this will get a warning telling them to use `use_transactional_tests=` instead. I’m maintaining backwards compatibility—both forms will work. `use_transactional_tests` will check to see if `use_transactional_fixtures` is set and use that, otherwise it will use itself. But because `use_transactional_tests` is a class attribute (created with `class_attribute`) this requires a little bit of hoop jumping. The writer method that `class_attribute` generates defines a new reader method that return the value being set. Which means we can’t set the default of `true` using `use_transactional_tests=` as was done previously because that won’t take into account anyone using `use_transactional_fixtures`. Instead I defined the reader method manually and it checks `use_transactional_fixtures`. If it was set then it should be used, otherwise it should return the default, which is `true`. If someone uses `use_transactional_tests=` then it will overwrite the backwards-compatible method with whatever they set.
* | | | | Merge pull request #19352 from artofhuman/masterRafael Mendonça França2015-03-161-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | Move Adapter to private constant
| * | | | Move Adapter to private constantSemyon Pupkov2015-03-161-0/+1
| | |/ / | |/| |
* | | | Merge pull request #19357 from boddhisattva/custom_rake_task_with_args_exampleAbdelkader Boudih2015-03-161-2/+2
|\ \ \ \ | |/ / / |/| | | Adds more clarity on how to use custom rake tasks with arguments passed to it [ci skip]
| * | | Adds an example of how to access the arguments passed to a custom rake task ↵Mohnish G J2015-03-161-2/+2
|/ / / | | | | | | | | | [ci skip]
* | | Merge pull request #19345 from davydovanton/doc-fix-spell-guidesXavier Noria2015-03-152-2/+2
|\ \ \ | | | | | | | | [skip ci] Fix typos in guides
| * | | [skip ci] Fix typos in guidesAnton Davydov2015-03-152-2/+2
| | | |
* | | | Merge pull request #19344 from davydovanton/doc-fix-spell-actionmailerArun Agrawal2015-03-151-1/+1
|\ \ \ \ | |/ / / |/| | | [skip ci] Fix typo in actionmailer documentation
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 14:00:01 +0000