aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add has_key? and key? methods to CookieJar removed in 0ca69ca65f83b4bb34f8José Valim2011-06-302-0/+14
* Merge pull request #1690 from vijaydev/mattr_accessor_changesJosé Valim2011-06-302-2/+13
|\
| * Added instance_accessor: false to Module#mattr_accessorVijay Dev2011-06-142-2/+13
* | Move Coffee generators and templates to Coffee Railtie and create javascript_...Santiago Pastorino2011-06-2910-46/+29
* | CommandRecorder should delegate in method_missing where possible. Fixes some ...Jon Leighton2011-06-302-2/+11
* | Array.wrap should follow Kernel#Array semantics when the object's to_ary is n...Jon Leighton2011-06-302-3/+4
* | Define to_ary on ActiveRecord::Base to return nil. Improve performance of Arr...Jon Leighton2011-06-301-0/+12
* | sub suffices hereXavier Noria2011-06-291-1/+1
* | Revert "Delegate to @flashes with 'delegate' instead of manually."Aaron Patterson2011-06-291-2/+24
* | Merge pull request #1909 from r00k/masterJosé Valim2011-06-291-24/+2
|\ \
| * | 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
|\ \
| * | 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
* | | Merge pull request #1897 from istewart/active_model_dirty_patchJosé Valim2011-06-292-1/+10
|\ \ \ | |/ / |/| |
| * | 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.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 change.Arun Agrawal2011-06-291-2/+10
| |/ /
* | | Merge pull request #1574 from oriolgual/1571_ar_relation_order_no_longer_work...Aaron Patterson2011-06-282-1/+13
|\ \ \
| * | | 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 rsim/fix_test_finding_with_cross_table_order_an...Aaron Patterson2011-06-281-3/+3
|\ \ \ | |/ / |/| |
| * | Fix test_finding_with_cross_table_order_and_limit for OracleRaimonds Simanovskis2011-06-281-3/+3
|/ /
* | Merge pull request #1857 from vijaydev/irreversible-migrationAaron Patterson2011-06-282-7/+9
|\ \
| * | record unsupported methods in CommandRecorder instead of letting the unsuppor...Vijay Dev2011-06-252-7/+9
* | | Merge pull request #1860 from dmathieu/comparisonAaron Patterson2011-06-282-0/+22
|\ \ \
| * | | 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
|\ \ \ \
| * | | | No need to register again. As it's default now.Arun Agrawal2011-06-281-3/+3
* | | | | 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::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
|\ \ \ \
| * | | | Make send_file guess content-type from file extension, if type wasn't supplie...Esad Hajdarevic2011-06-282-2/+32
| * | | | 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 pi...Aaron Patterson2011-06-272-3/+4
* | | | 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