aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | 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.
* | | | | | Merge pull request #15502 from sgrif/sg-use-null-columnYves Senn2014-06-042-23/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Use null column for association key types
| * | | | | | Use null column for association key typesSean Griffin2014-06-042-23/+23
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'master' of github.com:rails/railsAaron Patterson2014-06-0434-134/+268
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of github.com:rails/rails: For our build, stick with mail 2.5.x for now Correct result, previously showing wrong result Collapse PG default extractoin of most types to single regex Change wording of explanation about precision & scale of decimal numbers [ci skip] Cleaned up duplicated CHANGELOG entry [ci skip] reuse available belongs_to? method Convert StrongParameters cache to a hash. This fixes an unbounded memory leak demonstrated on @tenderlove's latest blog post: Partially revert deprecation of *_filter Pluralize params Add default_i18n_subject to the guides Fix regression on eager loading association based on SQL query rather than existing column. Relax mail gem constraint from ~> 2.5.4 to ~> 2.5, >= 2.5.4 Keep column defaults in type cast form Return a null column when no column exists for an attribute Refactor XML serializer to not depend on `serialized_attributes` Test the serialized types of virtual columns in XML implement ActiveRecord::Base#pretty_print + changelog Remove duplicated HashWithIndifferentAccess#with_indifferent_access.
| * | | | | | For our build, stick with mail 2.5.x for nowMatthew Draper2014-06-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.6 currently has many warnings, which are failing the Travis build.
| * | | | | | Merge pull request #15504 from sgrif/sg-postgres-defaultsRafael Mendonça França2014-06-042-48/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Collapse PG default extractoin of most types to single regex
| | * | | | | | Collapse PG default extractoin of most types to single regexSean Griffin2014-06-042-48/+11
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For any type that is represented as a string and then type cast, we do not need separate regular expressions for the various types. No function will match this regex. User defined types *should* match this, so that the type object can decide what to do with the value.
| * | | | | | Merge pull request #15495 from maurogeorge/action-mailer-subject-guidesRafael Mendonça França2014-06-041-0/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add default_i18n_subject to the guides
| | * | | | | | Pluralize paramsMauro George2014-06-031-1/+1
| | | | | | | |
| | * | | | | | Add default_i18n_subject to the guidesMauro George2014-06-031-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Merge pull request #15505 from akshay-vishnoi/doc_changesSantiago Pastorino2014-06-041-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Correct result, previously showing wrong result
| | * | | | | | | Correct result, previously showing wrong resultAkshay Vishnoi2014-06-041-1/+1
| |/ / / / / / /
| * | | | | | | Merge pull request #15463 from geopet/refactor_xml_compute_typeRafael Mendonça França2014-06-042-6/+7
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Refactor XML serializer to not depend on `serialized_attributes`
| | * | | | | | Refactor XML serializer to not depend on `serialized_attributes`Geoff Petrie & Sean Griffin2014-06-011-3/+5
| | | | | | | |
| | * | | | | | Test the serialized types of virtual columns in XMLGeoff Petrie & Sean Griffin2014-06-012-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous tests were passing, because nothing ever looked at the generated XML. What was previously being generated was `<firstname type="NilClass">...`, which is not consistent with all other cases where there is not a known type.
| * | | | | | | Merge pull request #15500 from ↵Yves Senn2014-06-041-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/change-wording-of-explanation-about-precision-and-scale-of-decimal-numbers Change wording of explanation about precision & scale of decimal numbers [ci skip]
| | * | | | | | | Change wording of explanation about precision & scale of decimal numbers [ci ↵Prathamesh Sonpatki2014-06-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skip]
| * | | | | | | | Merge pull request #15482 from laurocaetano/fix-regression-for-eager-loadCarlos Antonio da Silva2014-06-044-2/+27
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix regression on eager loading association based on SQL query rather than existing column. Conflicts: activerecord/CHANGELOG.md
| | * | | | | | | Fix regression on eager loading association based on SQL query ratherLauro Caetano2014-06-034-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than existing column. Fixes #15480.
| * | | | | | | | Cleaned up duplicated CHANGELOG entry [ci skip]Godfrey Chan2014-06-031-3/+2
| | | | | | | | |
| * | | | | | | | Merge pull request #15498 from zenspider/fix_memory_leakGuillermo Iguaran2014-06-032-7/+7
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Convert StrongParameters cache to a hash. This fixes an unbounded memory leak
| | * | | | | | | | Convert StrongParameters cache to a hash. This fixes an unboundedRyan Davis2014-06-032-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | memory leak demonstrated on @tenderlove's latest blog post: http://tenderlovemaking.com/2014/06/02/yagni-methods-are-killing-me.html
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 14:14:36 +0000