aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1909 from r00k/masterJosé Valim2011-06-291-24/+2
|\ | | | | Use 'delegate' macro instead of writing out methods by hand
| * Delegate to @flashes with 'delegate' instead of manually.Ben Orenstein2011-06-291-24/+2
|/
* Merge pull request #1899 from ihower/patch_rake_testJosé Valim2011-06-292-2/+32
|\ | | | | Make "rake test" display not only task name but also exception message.
| * Add test to rake test for error messagesWen-Tien Chang2011-06-302-1/+31
| |
| * Make "rake test" display not only task name but also exception message.Wen-Tien Chang2011-06-291-2/+2
| |
* | Fix configurable cristalization and tests.José Valim2011-06-292-8/+18
| |
* | [IMPORTANT] Make "sprockets/railtie" require explicit.José Valim2011-06-2911-10/+30
| | | | | | | | | | | | | | | | | | | | This makes "sprockets/railtie" explicit. This means that sprockets will be loaded when you require "rails/all". If you are not using requiring "rails/all", you need to manually load it with all other framework railties. In order to be complete, this commit also adds --skip-sprockets to the rails generator.
* | Merge pull request #1897 from istewart/active_model_dirty_patchJosé Valim2011-06-292-1/+10
|\ \ | |/ |/| ActiveModel::Dirty patch for multiple assignments to the same attribute
| * changing an attribute multiple times retains the correct original valueIan Stewart2011-06-282-1/+10
|/
* Merge pull request #1883 from arunagw/time_zone_fixAaron Patterson2011-06-281-4/+4
|\ | | | | Using not effected timezone in tests.
| * Using not effected timezone in tests.Arun Agrawal2011-06-291-4/+4
| |
* | Merge pull request #1886 from arunagw/fix_test_for_jruby_dbSantiago Pastorino2011-06-281-2/+10
|\ \ | | | | | | fix test when running Jruby. If Jruby Platform is available the gem will
| * | fix test when running Jruby. If Jruby Platform is available the gem will change.Arun Agrawal2011-06-291-2/+10
| |/
* | Merge pull request #1574 from ↵Aaron Patterson2011-06-282-1/+13
|\ \ | | | | | | | | | | | | oriolgual/1571_ar_relation_order_no_longer_works_with_arel_nodes Fix #1571 ActiveRecord::Relation#order no longer works with arel ordering nodes
| * | Fix caseOriol Gual2011-06-281-2/+1
| | |
| * | Update reverse order with new Arel NodesOriol Gual2011-06-281-1/+2
| | |
| * | Add more test casesOriol Gual2011-06-281-0/+8
| | |
| * | Add failing testOriol Gual2011-06-281-0/+4
| |/
* | Merge pull request #1882 from ↵Aaron Patterson2011-06-281-3/+3
|\ \ | |/ |/| | | | | rsim/fix_test_finding_with_cross_table_order_and_limit Fix test_finding_with_cross_table_order_and_limit for Oracle
| * Fix test_finding_with_cross_table_order_and_limit for OracleRaimonds Simanovskis2011-06-281-3/+3
|/ | | Use latest Arel syntax and pass each order by expression as separate argument to order method as otherwise invalid Oracle SQL is generated.
* Merge pull request #1857 from vijaydev/irreversible-migrationAaron Patterson2011-06-282-7/+9
|\ | | | | IrreversibleMigration is not raised when a method not supported by reversible migrations is called in the change method of a migration
| * record unsupported methods in CommandRecorder instead of letting the ↵Vijay Dev2011-06-252-7/+9
| | | | | | | | unsupported methods go through to the underlying db causing errors like duplicate columns to occur when rolling back migrations
* | Merge pull request #1860 from dmathieu/comparisonAaron Patterson2011-06-282-0/+22
|\ \ | | | | | | Allow comparison on model objects - Closes #1858
| * | comparing different classes returns nilDamien Mathieu2011-06-262-1/+11
| | |
| * | allow comparison on model objects - Closes #1858Damien Mathieu2011-06-262-0/+12
| | |
* | | remove useless assignmentAaron Patterson2011-06-281-2/+1
| | |
* | | lock_optimistically is typically true, so evaluate the common failure case firstAaron Patterson2011-06-281-1/+1
| | |
* | | reduce object allocation during AR instantiationAaron Patterson2011-06-282-3/+8
| | |
* | | Merge pull request #1878 from arunagw/mime_test_fixJosé Valim2011-06-281-3/+3
|\ \ \ | | | | | | | | Removing image/gif from this test.
| * | | No need to register again. As it's default now.Arun Agrawal2011-06-281-3/+3
| | | | | | | | | | | | Removing gif from here because when it got unregister it start failing other places.
* | | | Update railties.gemspecJosé Valim2011-06-281-0/+3
|/ / /
* | | Copy the bin to railties so it also works if you don't have the rails gem.José Valim2011-06-281-0/+2
| | |
* | | Merge pull request #1877 from arunagw/fix_mimeJosé Valim2011-06-282-4/+4
|\ \ \ | | | | | | | | Fix test to use Mime::Zip
| * | | Fix test to use Mime::ZipArun Agrawal2011-06-282-4/+4
|/ / /
* | | Edited actionpack/CHANGELOG via GitHubJosé Valim2011-06-281-0/+4
| | |
* | | Merge pull request #1875 from esad/masterJosé Valim2011-06-283-2/+44
|\ \ \ | | | | | | | | Fixed issue #1847
| * | | Make send_file guess content-type from file extension, if type wasn't ↵Esad Hajdarevic2011-06-282-2/+32
| | | | | | | | | | | | | | | | supplied (Issue #1847). Update tests & documentation.
| * | | Register some commonly used mime types (png, jpeg, pdf, zip etc.) per defaultEsad Hajdarevic2011-06-281-0/+12
|/ / /
* | | remove the check for needs_type_condition? because ensure_proper_type will ↵Aaron Patterson2011-06-272-3/+4
| | | | | | | | | | | | pick up the type column
* | | stop using && for the short circuit side effectAaron Patterson2011-06-271-1/+1
| | |
* | | let strings be converted to symbols inside the interpreterAaron Patterson2011-06-271-2/+2
| | |
* | | avoice paying hash cost if there are no serialized attributesAaron Patterson2011-06-271-3/+4
| | |
* | | cache column defaults for AR object instantiationAaron Patterson2011-06-273-3/+16
| | |
* | | AR object instantiation is ~30% faster in the simple caseAaron Patterson2011-06-272-1/+17
| | |
* | | initialize instance variablesAaron Patterson2011-06-271-0/+2
| | |
* | | oops! remove debugging codesAaron Patterson2011-06-271-1/+0
| | |
* | | default create_with_value to a hash so we can eliminate conditionals, add ↵Aaron Patterson2011-06-275-5/+14
| | | | | | | | | | | | test surrounding create_with(nil) behavior
* | | Merge pull request #1871 from guilleiguaran/arel-2-1-3Aaron Patterson2011-06-272-2/+2
|\ \ \ | | | | | | | | Bump ARel to 2.1.3
| * | | Bump ARel to 2.1.3Guillermo Iguaran2011-06-272-2/+2
| |/ /
* | | Merge pull request #1870 from chriseppstein/asset_urls_masterSantiago Pastorino2011-06-278-72/+216
|\ \ \ | | | | | | | | Asset urls master
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 16:32:06 +0000