aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15535 from coreyward/patch-1Rafael Mendonça França2014-06-051-2/+2
|\
| * Avoid misuse of underscore argumentCorey Ward2014-06-051-2/+2
|/
* Merge pull request #15530 from zuhao/refactor_actionpack_reloader_testMatthew Draper2014-06-061-0/+5
|\
| * Reset callbacks after test.Zuhao Wan2014-06-051-0/+5
* | 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.Ryan Davis2014-06-043-91/+0
* | | Merge pull request #15523 from gregmolnar/doc_fixZachary Scott2014-06-051-1/+4
|\ \ \
| * | | 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.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.Zuhao Wan2014-06-051-1/+2
|/ / / /
* | | | Merge pull request #15529 from zuhao/refactor_actionpack_mime_type_testYves Senn2014-06-052-8/+0
|\ \ \ \
| * | | | 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 behavior of handling BC era dates.edogawaconan2014-06-053-3/+17
| |/ /
* | | Merge pull request #15525 from zuhao/refactor_actionpack_query_string_parsing...Yves Senn2014-06-051-1/+2
|\ \ \ | |/ / |/| |
| * | 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_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 lostGordon Chan2014-05-303-1/+36
* | | | Merge pull request #15518 from jonathancadepowers/masterGuillermo Iguaran2014-06-051-0/+4
|\ \ \ \
| * | | | Update getting_started.mdJonathan Powers2014-06-051-0/+2
| * | | | Update getting_started.mdJonathan Powers2014-06-051-0/+2
| | |/ / | |/| |
* | | | Merge pull request #15515 from leafac/fix-inverse-associations-block-testMatthew Draper2014-06-051-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix inverse associations testLeandro Facchinetti2014-06-041-1/+1
|/ / /
* | | Merge pull request #15497 from schneems/schneems/levenshtein-generator-failur...Rafael Mendonça França2014-06-043-9/+63
|\ \ \
| * | | Emit suggested generator names when not foundschneems2014-06-043-9/+63
|/ / /
* | | have an actual `NullColumn` object and update docs accordingly.Yves Senn2014-06-044-5/+16
* | | Revert "Correct Documentation for asset_tag_helpers"Rafael Mendonça França2014-06-041-17/+16
* | | Merge pull request #15502 from sgrif/sg-use-null-columnYves Senn2014-06-042-23/+23
|\ \ \
| * | | 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
|\ \ \ \
| * | | | For our build, stick with mail 2.5.x for nowMatthew Draper2014-06-051-0/+1
| * | | | 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 regexSean Griffin2014-06-042-48/+11
| | |/ / /
| * | | | Merge pull request #15495 from maurogeorge/action-mailer-subject-guidesRafael Mendonça França2014-06-041-0/+18
| |\ \ \ \
| | * | | | Pluralize paramsMauro George2014-06-031-1/+1
| | * | | | Add default_i18n_subject to the guidesMauro George2014-06-031-0/+18
| * | | | | Merge pull request #15505 from akshay-vishnoi/doc_changesSantiago Pastorino2014-06-041-1/+1
| |\ \ \ \ \
| | * | | | | 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`Geoff Petrie & Sean Griffin2014-06-011-3/+5
| | * | | | Test the serialized types of virtual columns in XMLGeoff Petrie & Sean Griffin2014-06-012-4/+3
| * | | | | Merge pull request #15500 from prathamesh-sonpatki/change-wording-of-explanat...Yves Senn2014-06-041-2/+2
| |\ \ \ \ \
| | * | | | | Change wording of explanation about precision & scale of decimal numbers [ci ...Prathamesh Sonpatki2014-06-041-2/+2
| * | | | | | 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 ratherLauro Caetano2014-06-034-2/+27
| * | | | | | Cleaned up duplicated CHANGELOG entry [ci skip]Godfrey Chan2014-06-031-3/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 03:08:15 +0000