aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge remote branch 'mainstream/master'Pratik Naik2010-01-28420-24351/+6729
|\|
| * Ensure test sets json time format flagJeremy Kemper2010-01-281-1/+4
| * Move the ActiveRecord generator settings into the RailtieCarl Lerche2010-01-285-7/+7
| * Add more tests to some key points in Railties.José Valim2010-01-2810-130/+190
| * Add reloadable specific for engines and move environment to application paths.José Valim2010-01-288-11/+23
| * Add config.to_prepare back and add tests for it.José Valim2010-01-283-1/+38
| * Refactor MetalLoader and RoutesReloader to rely less on class configuration.José Valim2010-01-286-35/+40
| * Cleanup the test_unit generator move into the railtieCarl Lerche2010-01-282-8/+9
| * Fix the test_framework generator testsCarl Lerche2010-01-283-1/+4
| * Test::Unit Railtie Carlhuda2010-01-286-5/+23
| * Merge branch 'rails/master' into ujsStefan Penner2010-01-27171-19801/+152
| |\
| | * Missed template change for defaults -> defaultJeremy Kemper2010-01-271-1/+1
| | * Rename 'defaults' class method to 'default' to reflect that it's a declarationJeremy Kemper2010-01-275-27/+27
| | * Attend to brittle mailer generator testsJeremy Kemper2010-01-271-3/+3
| | * Clear up some ivar warningsJeremy Kemper2010-01-271-3/+13
| | * Fix time comparison. Mail#date returns DateTime not Time.Jeremy Kemper2010-01-271-1/+1
| | * Expected attachment encoding is binaryJeremy Kemper2010-01-271-2/+4
| | * Use format of ARes rather than content-type of remote errors to load errors.Jatinder Singh2010-01-272-3/+16
| | * Time#- with a DateTime argument behaves the same as with a Time argument, i.e...Geoff Buesing2010-01-273-1/+7
| | * active_support/ordered_hash now requires yamlsnusnu2010-01-271-0/+2
| | * self.defaults => defaultJeremy Kemper2010-01-271-3/+4
| | * Remove unbundle changelogsJeremy Kemper2010-01-272-9/+1
| | * Merge remote branch 'mikel/master'Jeremy Kemper2010-01-27157-19756/+14
| | |\
| | | * Unvendor'd text-format, now requires text-format gemMikel Lindsaar2010-01-285-1478/+4
| | | * Unvendor'd MemCache-Client. Now requires the MemCache Client gem as a depend...Mikel Lindsaar2010-01-286-1157/+5
| | | * Unvendor'd Builder. Now requires the Builder gem as a dependencyMikel Lindsaar2010-01-2810-1041/+3
| | | * Unbundling TZInfoMikel Lindsaar2010-01-28142-16082/+4
| | | * Updated mail requirement to 2.1.2Mikel Lindsaar2010-01-281-1/+1
| | |/
| | * Adding custom yaml (de-)serialization for OrderedHashGregor Schmidt2010-01-273-1/+48
| | * Fixed bug on HTML only emails getting set to text/plainMikel Lindsaar2010-01-284-1/+21
| * | renaming javascript drivers to *.rails.js for better naming conventionErik St. Martin2010-01-272-0/+0
| * | initial prototype of jQuery driver completeErik St. Martin2010-01-271-5/+28
| * | jquery driver now supports :confirmErik St. Martin2010-01-271-2/+12
| * | jquery driver now supports :popupErik St. Martin2010-01-271-0/+17
| * | updated tests + docs, plus minor inconsistency fixesStefan Penner2010-01-272-138/+272
| * | tests + docsStefan Penner2010-01-271-62/+90
| * | support for observers in jquery driver, and minor bug fixesStephen St. Martin2010-01-271-17/+52
| * | initial prototype of prototype js driverErik St. Martin2010-01-271-17/+62
| * | observe_form now supports :with option as it shouldErik St. Martin2010-01-271-0/+10
| * | refactored to be more dry, data-update-failure now correctly works, combine c...Stephen St. Martin2010-01-272-102/+145
| * | Added regression tests that discovered the previous issue. Stefan Penner2010-01-271-0/+14
| * | :href should be comming in through html_options and not optionsErik St. Martin2010-01-272-2/+2
| * | removing container inline js function of observed elements :function callbackErik St. Martin2010-01-272-7/+10
| * | moving html_safe call into helpers directly as they only work from that levelErik St. Martin2010-01-271-4/+4
| * | start of prototype driver, missing observe_form, observe_field, and periodica...Erik St. Martin2010-01-271-0/+279
| * | periodically_call_remote does not need data-observe=trueErik St. Martin2010-01-272-2/+5
| * | need to tell erb that our <script> tag is html_safeErik St. Martin2010-01-271-1/+1
| * | test to go with last commit, explicit :href for link_to_remoteErik St. Martin2010-01-271-0/+5
| * | adding :href override to link_to_remoteErik St. Martin2010-01-271-1/+3
| * | adding support for :disable_with to button_to_remoteErik St. Martin2010-01-271-0/+4