aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* run prepare callbacks after after_initialize blocks so config.to_prepare actu...Jeremy Kemper2008-04-281-3/+3
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-04-282-5/+15
|\
| * Ruby 1.9 compat: force assert_select text encoding to the encoding of the reg...Jeremy Kemper2008-04-282-5/+15
| * Revert alias_method_chain exceptions as they broke aliasing class methods.Michael Koziarski2008-04-282-18/+1
| * Make alias_method_chain complain about duplicate aliases. PreviouslyJohn Barnette2008-04-282-1/+18
* | Let Base.all use conditions etc like first/lastDavid Heinemeier Hansson2008-04-283-1/+10
|/
* Fixed that BenchmarkHelper should use controller.logger instead of @logger (w...David Heinemeier Hansson2008-04-271-3/+5
* Added ActionController::TestCase#rescue_action_in_public! to control whether ...David Heinemeier Hansson2008-04-272-2/+23
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-04-2711-13/+90
|\
| * Be friendlier when upgrading apps with an old boot.rb.John Barnette2008-04-281-0/+4
| * Remove old :limit removal code from find_initial, logic is now handled in the...Aliaksey Kandratsenka2008-04-271-1/+1
| * Add default options to file_store to make it align with the other cache store...Michael Koziarski2008-04-261-2/+2
| * Ensure table names are quoted by the association preloading code.Frederick Cheung2008-04-268-10/+83
* | Changing "and" to && whereever I catch itDavid Heinemeier Hansson2008-04-271-1/+1
|/
* Added that the MySQL adapter should map integer to either smallint, int, or b...David Heinemeier Hansson2008-04-252-0/+18
* Pass template object to Handler#compilePratik Naik2008-04-244-4/+4
* Use .gitignore as the convention for dummy file names.Joshua Peek2008-04-246-0/+0
* Fixes a subtle bug when using symbols for key definitions in habtm associationsDavid Dollar2008-04-232-3/+32
* preventing generated documentation from being picked up by git. [#37 state:re...Sam Granieri2008-04-231-1/+7
* Make sure member names aren't mistakenly set to nil when providing :path_namesEugene Pimenov2008-04-232-8/+39
* Fix include? on has_many collections with finder_sql to fall back to Array in...Joshua Bates2008-04-232-0/+12
* Provide data for the key column otherwise adding a unique index will fail. [#...Frederick Cheung2008-04-231-0/+1
* Rails Edge info returns the latest git commit hash [#36 state:resolved]Francesc Esplugas2008-04-223-43/+39
* Use schema.rb for all databasesFrederick Cheung2008-04-2243-2928/+432
* Fallback to Ruby's pseudo random number generator if the system does not have...Joshua Peek2008-04-211-1/+6
* Don't require generator_test_helper in RailsGeneratorTest.Joshua Peek2008-04-211-3/+12
* Add .empty files to empty directories so git preserves them.Joshua Peek2008-04-216-0/+0
* Rescue from Timeout::Error in ActiveResource::Connection.Cheah Chu Yeow2008-04-223-1/+32
* Introduce ActiveResource::Base.timeout. This allows a timeout to be set on th...Cheah Chu Yeow2008-04-224-4/+117
* * Remove default_url_options from mailer generatorCody Fauser2008-04-213-17/+30
* Add back empty plugin folders that were lost when we moved to git.Joshua Peek2008-04-214-32/+32
* Revert "Update plugin loading tests to reflect changes in plugin fixtures."Joshua Peek2008-04-213-79/+86
* Update plugin loading tests to reflect changes in plugin fixtures.Joshua Peek2008-04-213-86/+79
* Gem dependencies don't require a version. Also fixed up failing gem dependenc...Joshua Peek2008-04-212-3/+5
* Mock RailsFCGIHandler and Dispatcher to stop mocha deprecation warnings.Joshua Peek2008-04-211-6/+24
* Alias Object#instance_variable_names to Object#instance_variables for Ruby 1.8.xPratik Naik2008-04-211-2/+6
* Delegate ivars to controller instead of copyingPratik Naik2008-04-214-10/+23
* select_datetime and select_time default to Time.zone.now when config.time_zon...gbuesing2008-04-213-2/+22
* datetime_select defaults to Time.zone.now when config.time_zone is setgbuesing2008-04-213-1/+39
* Use the rails user when creating and dropping the database rather than fallin...Steven Soroka2008-04-211-6/+6
* Merge branch 'master' of git@github.com:rails/railsgbuesing2008-04-209-71/+40
|\
| * Ruby 1.8.7 compat: detect and alias non-superclass DateTime#to_sJeremy Kemper2008-04-201-4/+9
| * Ruby 1.8.7 compat: override unordered Enumerable#group_byJeremy Kemper2008-04-201-1/+4
| * Ruby 1.8.7 compat: String#start_with? and #end_with?Jeremy Kemper2008-04-203-14/+19
| * Remove ActionController::Base#view_controller_internalsPratik Naik2008-04-214-45/+8
| * Remove ActionController::Base#add_class_variables_to_assignsPratik Naik2008-04-211-7/+0
* | Duration #since and #ago with no argument (e.g., 5.days.ago) return TimeWithZ...gbuesing2008-04-205-3/+76
|/
* Merge commit 'rails/master'Jeremy Kemper2008-04-202-2/+2
|\
| * Avoid adding two DISTINCT statements to queries in sqlite 2.Frederick Cheung2008-04-211-1/+1
| * Fix sqlite adapter to work with the quoted table names returned by later vers...Frederick Cheung2008-04-211-1/+1