Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | require_dependency should allow Pathname-like objects, not just String | Benjamin Fleischer | 2013-09-30 | 2 | -1/+14 |
| | |||||
* | Merge pull request #10222 from senny/update_bundler_section_in_assets_guide | Rafael Mendonça França | 2013-05-23 | 1 | -9/+7 |
|\ | | | | | | | | | docs, adjust the application.rb snippets to match the generated file. Closes #10449 | ||||
| * | asset guide, match application.rb snippets to the generated file [ci skip] | Yves Senn | 2013-04-15 | 1 | -9/+7 |
| | | | | | | | | `if defined?(Bundler)` is no longer used in our current application.rb | ||||
* | | Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_many | Rafael Mendonça França | 2013-05-23 | 4 | -2/+15 |
|\ \ | | | | | | | Fix the `:primary_key` option for `has_many` associations. | ||||
| * | | Fix the `:primary_key` option for `has_many` associations. | Yves Senn | 2013-05-23 | 4 | -2/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When removing records from a `has_many` association it used the `primary_key` defined on the association. Our test suite didn't fail because on all occurences of `:primary_key`, the specified column was available in both tables. This prevented the code from raising an exception but it still behaved badly. I added a test-case to prevent regressions that failed with: ``` 1) Error: HasManyAssociationsTest#test_has_many_assignment_with_custom_primary_key: ActiveRecord::StatementInvalid: SQLite3::SQLException: no such column: essays.first_name: UPDATE "essays" SET "writer_id" = NULL WHERE "essays"."writer_id" = ? AND "essays"."first_name" IS NULL ``` | ||||
* | | | Merge branch 'deprecate-validator-setup' | Rafael Mendonça França | 2013-05-23 | 8 | -42/+61 |
|\ \ \ | |/ / |/| | | | | | Closes #10716 | ||||
| * | | deprecate Validator#setup (to get rid of a respond_to call). validators do ↵ | Nick Sutterer | 2013-05-23 | 8 | -42/+61 |
|/ / | | | | | | | their setup in their constructor now. | ||||
* | | Add CHANGELOG entry for 99860582b2b1c0fc42bf84c52aac57b243d42678 | Rafael Mendonça França | 2013-05-22 | 1 | -0/+6 |
| | | |||||
* | | Require only minitest. | Rafael Mendonça França | 2013-05-22 | 2 | -2/+2 |
| | | | | | | | | | | minitest/autorun required minitest/spec and we are avoiding to require it. | ||||
* | | Merge pull request #10667 from rubys/minitest-autorun | Rafael Mendonça França | 2013-05-22 | 2 | -2/+2 |
|\ \ | | | | | | | Eliminate minitest warnings | ||||
| * | | Eliminate minitest warnings | Sam Ruby | 2013-05-17 | 2 | -2/+2 |
| | | | | | | | | | | | | https://github.com/seattlerb/minitest/commit/9a57c520ceac76abfe6105866f8548a94eb357b6#L15R8 | ||||
* | | | Merge pull request #10725 from neerajdotname/remove_code_duplication | Carlos Antonio da Silva | 2013-05-22 | 1 | -2/+3 |
|\ \ \ | | | | | | | | | Remove code duplication | ||||
| * | | | remove code duplication | Neeraj Singh | 2013-05-22 | 1 | -2/+3 |
|/ / / | |||||
* | | | Merge pull request #10714 from tkhr/extract_test_from_base_test.rb_in_AR | Carlos Antonio da Silva | 2013-05-22 | 4 | -45/+54 |
|\ \ \ | | | | | | | | | Extract tests code out from AR's base_test.rb | ||||
| * | | | Extract AR::Persistence#becomes's test code out from base_test.rb | Takehiro Adachi | 2013-05-22 | 2 | -13/+13 |
| | | | | | | | | | | | | | | | | | | | | The method got extracted out from AR::Base in commit d916c62cfc7c59ab6411407a05b946d3dd7535e9, but the tests never did. | ||||
| * | | | Extract AR::AttributeMethods#attribute_for_inspect's test code out from ↵ | Takehiro Adachi | 2013-05-22 | 2 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | base_test.rb The method itself got extracted out from ActiveRecored::Base in commit ceb33f84933639d3b61aac62e5e71fd087ab65ed, but the test code never did. | ||||
| * | | | Extract AR::Core#inspect and AR::Core.inspect's test code from base_test.rb | Takehiro Adachi | 2013-05-22 | 2 | -24/+33 |
| | | | | | | | | | | | | | | | | | | | | The methods got moved to core.rb in commit b2c9ce341a1c907041f55461aefebb0321280cb5, but the tests never did. | ||||
* | | | | Merge pull request #10722 from jgaskins/patch-1 | José Valim | 2013-05-22 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Add ActiveModel requirement to application.rb | ||||
| * | | | | Add ActiveModel requirement to application.rb | Jamie Gaskins | 2013-05-22 | 1 | -0/+1 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, ActiveModel is only loaded by ActiveRecord. If you skip ActiveRecord, ActiveModel will not be required (or even autoloaded) and including `ActiveModel::Model` into a plain Ruby class will raise `NameError`. To reproduce this: - create a new app with `rails new my_app -O` - create a Ruby class that includes `ActiveModel::Model` in `app/models` - load up a Rails console and try to do anything with the class :-) Since ActionPack relies so heavily on the ActiveModel API, this should probably be considered a dependency of the app. Another possibility would be to make it a dependency of ActionController. | ||||
* | | | | reverse comparison because of strange AS behavior | Aaron Patterson | 2013-05-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | http://tenderlovemaking.com/2013/05/21/one-danger-of-freedom-patches.html | ||||
* | | | | just set the default argument, a nil parent should be an error | Aaron Patterson | 2013-05-21 | 1 | -2/+1 |
| | | | | |||||
* | | | | fold the collection rather than multiple assigments | Aaron Patterson | 2013-05-21 | 1 | -3/+2 |
| | | | | |||||
* | | | | use drop rather than calculate the array length | Aaron Patterson | 2013-05-21 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'bindwhere' | Aaron Patterson | 2013-05-21 | 2 | -20/+42 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bindwhere: avoid creating a set if no where values are removed remove bind values for where clauses that were removed push partitioning up so bind elimination can get the removed wheres push partion logic down and initialization logic up partition the where values so we can access the removed ones | ||||
| * | | | | avoid creating a set if no where values are removed | Aaron Patterson | 2013-05-21 | 2 | -0/+14 |
| | | | | | |||||
| * | | | | remove bind values for where clauses that were removed | Aaron Patterson | 2013-05-21 | 2 | -9/+18 |
| | | | | | |||||
| * | | | | push partitioning up so bind elimination can get the removed wheres | Aaron Patterson | 2013-05-21 | 1 | -5/+3 |
| | | | | | |||||
| * | | | | push partion logic down and initialization logic up | Aaron Patterson | 2013-05-21 | 1 | -15/+11 |
| | | | | | |||||
| * | | | | partition the where values so we can access the removed ones | Aaron Patterson | 2013-05-20 | 1 | -1/+6 |
| |/ / / | |||||
* | | | | Merge pull request #10711 from senny/10660_rake_db_test_prepare_needs_config | Rafael Mendonça França | 2013-05-21 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | the rake task `db:test:prepare` needs to load the configuration | ||||
| * | | | | the rake task `db:test:prepare` needs to load the configuration | Yves Senn | 2013-05-21 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | Without loading the configuration the task will not perform any work. | ||||
* | | | | Merge pull request #10702 from divineforest/use-total-in-batches-test | Carlos Antonio da Silva | 2013-05-21 | 1 | -7/+5 |
|\ \ \ \ | |/ / / |/| | | | Use @total variable created in the setup of batches tests instead of counting again. | ||||
| * | | | In batches test @total was assigned but not used. Use it in tests instead of ↵ | Alexander Balashov | 2013-05-21 | 1 | -7/+5 |
|/ / / | | | | | | | | | | Post.count | ||||
* | | | eliminate some conditionals | Aaron Patterson | 2013-05-20 | 1 | -3/+3 |
| | | | |||||
* | | | change method name to reflect what it actually does. | Aaron Patterson | 2013-05-20 | 1 | -2/+2 |
| | | | |||||
* | | | save the where values in variables so we don't need to look them up all | Aaron Patterson | 2013-05-20 | 1 | -4/+5 |
| | | | | | | | | | | | | the time | ||||
* | | | pass where values to the helper function rather than rely on internal state | Aaron Patterson | 2013-05-20 | 1 | -4/+4 |
| | | | |||||
* | | | Merge pull request #10697 from zhubert/patch-1 | Steve Klabnik | 2013-05-20 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Spelling correction in Upgrading Guide [ci skip] | ||||
| * | | | Spelling correction in Upgrading Guide | Zack Hubert | 2013-05-20 | 1 | -1/+1 |
|/ / / | | | | | | | Fixes spelling of 'erratta' to 'errata' | ||||
* | | | Add has_named_route? to the mapper API | José Valim | 2013-05-20 | 2 | -0/+18 |
| | | | |||||
* | | | No need CHANGELOG entry for a test fix | Rafael Mendonça França | 2013-05-20 | 1 | -4/+1 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #10646 from kennyj/fix_am_20130517 | Rafael Mendonça França | 2013-05-20 | 2 | -2/+5 |
|\ \ \ | | | | | | | | | Fix ActionMailer testcase break with mail 2.5.4. | ||||
| * | | | Fix AM testcase break with mail 2.5.4. It seems that AM's testcase was wrong. | kennyj | 2013-05-17 | 2 | -2/+5 |
| | | | | |||||
* | | | | Merge pull request #10692 from vipulnsward/fix_test_3 | José Valim | 2013-05-19 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix wrong `case_sensitive` in uniqueness validity test | ||||
| * | | | | Fix wrong `case_sensitive` in uniqueness validity test | Vipul A M | 2013-05-20 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #10691 from vipulnsward/typo_fix_ar_1 | Steve Klabnik | 2013-05-19 | 2 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix typo in test name and documentation | ||||
| * | | | | Fix typo in test name and documentation | Vipul A M | 2013-05-20 | 2 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #10688 from elgalu/master | Rafael Mendonça França | 2013-05-19 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Missing ending ``` at 14.2 Merging of scopes | ||||
| * | | | | Missing ending ``` at 14.2 Merging of scopes | Leo Gallucci | 2013-05-19 | 1 | -0/+1 |
|/ / / / | | | | | | | | | http://edgeguides.rubyonrails.org/active_record_querying.html#merging-of-scopes | ||||
* | | | | Merge pull request #10659 from vipulnsward/normalize_param2 | Rafael Mendonça França | 2013-05-19 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | "normalize_callback_params" doesn't require name param |