aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15544 from zuhao/refactor_actionmailer_test_caseSantiago Pastorino2014-06-061-0/+8
|\ | | | | Restore test deliveries properly in ActionMailer.
| * Restore test deliveries properly in ActionMailer.Zuhao Wan2014-06-071-0/+8
|/ | | | | | | | | | | `ActionMailer::Base.delivery_method` and `ActionMailer::Base.perform_deliveries` have leaked states. "delivery method can be customized per instance" and "delivery method can be customized in subclasses not changing the parent" in delivery_methods_test.rb will fail if test_helper_test.rb (in which TestHelperMailerTest is inherited from ActionMailer::TestCase) runs before it.
* Merge pull request #15533 from sgrif/sg-missing-schema-testsYves Senn2014-06-061-0/+29
|\ | | | | Add missing test cases for schema dumping defaults
| * Add missing test cases for schema dumping defaultsSean Griffin2014-06-061-0/+29
| |
* | credit JoseLuis Torres for #15051. [JoseLuis Torres]Yves Senn2014-06-061-1/+1
| | | | | | | | [ci skip]
* | `ActiveRecord::SchemaMigration` has no primary key.Yves Senn2014-06-063-0/+24
| | | | | | | | | | | | | | | | | | | | Before this patch, using `ActiveRecord::Base.primary_key_prefix_type` with `:table_name_with_underscore` would change the `SchemaMigration` model to have a primary key. This resulted in broken queries for PG because it tried to return the inserted PK (which does not exist). Closes #15051. Closes #15419.
* | test refactor, don't hardcode default for `table_name_prefix`.Yves Senn2014-06-061-1/+2
| |
* | test refactor, don't hardcode `primary_key_prefix_type` default.Yves Senn2014-06-061-0/+3
| | | | | | | | /cc @zuhao
* | serialized Type should delegate `type_cast_for_write` to underlying TypeYves Senn2014-06-062-1/+36
|/ | | | | | | This adds a regression test for #14411, which was fixed by #15503. Closes #14411 Closes #14595
* Merge pull request #15503 from sgrif/sg-json-hstore-storageYves Senn2014-06-069-20/+29
|\ | | | | Bring type casting behavior of hstore/json in line with serialized
| * Bring type casting behavior of hstore/json in line with serializedSean Griffin2014-06-049-20/+29
| | | | | | | | | | `@raw_attributes` should not contain the type-cast, mutable version of the value.
* | Merge pull request #15540 from nbibler/http-headers-setYves Senn2014-06-061-8/+21
|\ \ | | | | | | Use a frozen Set instance for CGI_VARIABLES.
| * | Use a frozen Set instance for CGI_VARIABLES.Nathaniel Bibler2014-06-051-8/+21
| | | | | | | | | Also expand the CGI_VARIABLE name listing to multiple lines for cleaner diffs and legibility.
* | | `bin/rake db:migrate:status` works with legacy migration numbers.Yves Senn2014-06-065-4/+22
| | | | | | | | | | | | | | | | | | | | | The migration numbers were normalized different ways. This left the task output in an inconsistent state. Closes #15538.
* | | docs, update `includes` + `where` example in AR guide. [ci skip]Yves Senn2014-06-061-3/+16
| | | | | | | | | | | | Closes #15541.
* | | Merge pull request #14971 from versioncontrol/#14785Yves Senn2014-06-063-1/+26
|\ \ \ | |/ / |/| | | | | Baseclass becomes! subclass
| * | Fix Baseclass becomes! subclass.Edo Balvers2014-05-133-1/+26
| | |
* | | Merge pull request #15536 from sgrif/sg-remove-whiny-nil-thingRafael Mendonça França2014-06-051-8/+0
|\ \ \ | | | | | | | | Remove optimization that was required with whiny nils
| * | | Remove optimization that was required with whiny nilsSean Griffin2014-06-051-8/+0
| | | | | | | | | | | | | | | | Whiny nils is no longer a thing, so we no longer need this optimization
* | | | Merge pull request #15535 from coreyward/patch-1Rafael Mendonça França2014-06-051-2/+2
|\ \ \ \ | | | | | | | | | | Avoid misuse of underscore argument
| * | | | Avoid misuse of underscore argumentCorey Ward2014-06-051-2/+2
|/ / / / | | | | | | | | Per convention, underscore-only argument names should be used for unused parameters.
* | | | Merge pull request #15530 from zuhao/refactor_actionpack_reloader_testMatthew Draper2014-06-061-0/+5
|\ \ \ \ | | | | | | | | | | Reset callbacks after test.
| * | | | Reset callbacks after test.Zuhao Wan2014-06-051-0/+5
| | | | | | | | | | | | | | | | | | | | Otherwise the state of callback chain is leaked.
* | | | | Merge pull request #15513 from zenspider/remove_flush_output_bufferAaron Patterson2014-06-053-91/+0
|\ \ \ \ \ | | | | | | | | | | | | Removed CaptureHelper#flush_output_buffer as it is only used in tests.
| * | | | | Removed CaptureHelper#flush_output_buffer as it is only used in tests.Ryan Davis2014-06-043-91/+0
| | | | | | | | | | | | | | | | | | | | | | | | reviewed: @tenderlove
* | | | | | Merge pull request #15523 from gregmolnar/doc_fixZachary Scott2014-06-051-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | document include_blank's usage with a string [ci skip]
| * | | | | | document include_blank's usage with a string [ci skip]Greg Molnar2014-06-051-1/+4
| | | | | | |
* | | | | | | Merge pull request #15532 from zuhao/refactor_actionpack_response_testYves Senn2014-06-051-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Restore Response.default_headers after test.
| * | | | | | | Restore Response.default_headers after test.Zuhao Wan2014-06-051-2/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #15531 from zuhao/refactor_actionpack_request_testYves Senn2014-06-051-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Avoid hard-coded value in test setup/teardown.
| * | | | | | Avoid hard-coded value in test setup/teardown.Zuhao Wan2014-06-051-1/+2
|/ / / / / /
* | | | | | Merge pull request #15529 from zuhao/refactor_actionpack_mime_type_testYves Senn2014-06-052-8/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make sure Mime::Type is not altered after tests.
| * | | | | | Mime::PNG is already defined.Zuhao Wan2014-06-052-8/+0
| |/ / / / /
* | | | | | Merge pull request #15521 from edogawaconan/fix_bc_postgres_masterMatthew Draper2014-06-053-3/+17
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix BC year handling in postgres
| * | | | | Fix behavior of handling BC era dates.edogawaconan2014-06-053-3/+17
| |/ / / / | | | | | | | | | | | | | | | BC era year is (astronomical year + 1) and starts from 1 BC.
* | | | | Merge pull request #15525 from ↵Yves Senn2014-06-051-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | zuhao/refactor_actionpack_query_string_parsing_test Avoid hardcoded value in test setup/teardown.
| * | | | Avoid hardcoded value in test setup/teardown.Zuhao Wan2014-06-051-1/+2
|/ / / /
* | | | Merge pull request #15512 from akshay-vishnoi/delete-deprecated-methodYves Senn2014-06-053-54/+5
|\ \ \ \ | | | | | | | | | | | | | | | Remove deprecated method ActiveRecord::Migrator.proper_table_name
| * | | | Remove deprecated method ActiveRecord::Migrator.proper_table_nameAkshay Vishnoi2014-06-053-54/+4
| | | | |
* | | | | Merge pull request #15421 from gchan/time_with_zone_precisionMatthew Draper2014-06-053-1/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixed `ActiveSupport::TimeWithZone#-` so precision is not unnecessarily lost
| * | | | | Fixed `ActiveSupport::TimeWithZone#-` so precision is not unnecessarily lostGordon Chan2014-05-303-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When working with objects with a nanosecond component, the `-` method may unnecessarily cause loss of precision. `ActiveSupport::TimeWithZone#-` should return the same result as if we were using `Time#-`: Time.now.end_of_day - Time.now.beginning_of_day #=> 86399.999999999 Before: Time.zone.now.end_of_day.nsec #=> 999999999 Time.zone.now.end_of_day - Time.zone.now.beginning_of_day #=> 86400.0 After: Time.zone.now.end_of_day - Time.zone.now.beginning_of_day #=> 86399.999999999
* | | | | | Merge pull request #15518 from jonathancadepowers/masterGuillermo Iguaran2014-06-051-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added Two Clarification "Tips" [ci skip]
| * | | | | | Update getting_started.mdJonathan Powers2014-06-051-0/+2
| | | | | | | | | | | | | | | | | | | | | It's not very clear exactly what the "params" method is and does, as the current description in the guide is somewhat vague and brief. An example is helpful, especially considering this method is referenced over 30 times in this guide. [ci skip]
| * | | | | | Update getting_started.mdJonathan Powers2014-06-051-0/+2
| | |/ / / / | |/| | | | | | | | | | It may be confusing to a Rails newbie why "Article" is suddenly being referred to with the "A" being capitalized. Thus far in the guide, the "a" has always been in lowercase. I think it is helpful to point out the reason for this change (especially since not using the capital "A" will result in an error). [ci skip]
* | | | | | Merge pull request #15515 from leafac/fix-inverse-associations-block-testMatthew Draper2014-06-051-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix inverse associations test
| * | | | | Fix inverse associations testLeandro Facchinetti2014-06-041-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | `InverseHasManyTests#test_parent_instance_should_be_shared_within_create_block_of_new_child` was mistakenly the same as `InverseHasManyTests#test_parent_instance_should_be_shared_within_build_block_of_new_child`.
* | | | | Merge pull request #15497 from ↵Rafael Mendonça França2014-06-043-9/+63
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | schneems/schneems/levenshtein-generator-failure-messages Emit suggested generator names when not found
| * | | | | Emit suggested generator names when not foundschneems2014-06-043-9/+63
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When someone types in a generator command it currently outputs all generators. Instead we can attempt to find a subtle mis-spelling by running all generator names through a levenshtein_distance algorithm provided by rubygems. So now a failure looks like this: ```ruby $ rails generate migratioooons Could not find generator 'migratioooons'. Maybe you meant 'migration' or 'integration_test' or 'generator' Run `rails generate --help` for more options. ``` If the suggestions are bad we leave the user with the hint to run `rails generate --help` to see all commands.
* | | | | have an actual `NullColumn` object and update docs accordingly.Yves Senn2014-06-044-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to #15438 and #15502. /cc @sgrif
* | | | | Revert "Correct Documentation for asset_tag_helpers"Rafael Mendonça França2014-06-041-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c22a253d1a72602331db1eba3e91bc945eff2346. Reason: Our documentation assumes the assets are in the proper place and we are using the default Rails stack. With the default Rails stack and the assets being in the correct place the assets helpers uses the `/assets` prefix.