aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* run prepare callbacks after after_initialize blocks so config.to_prepare ↵Jeremy Kemper2008-04-281-3/+3
| | | | actually works
* 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 ↵Jeremy Kemper2008-04-282-5/+15
| | | | | | | | regexp it's matching against.
| * Revert alias_method_chain exceptions as they broke aliasing class methods.Michael Koziarski2008-04-282-18/+1
| | | | | | | | This reverts commit be48cad9a41ebf88ae19f2381a57917d532734c9.
| * Make alias_method_chain complain about duplicate aliases. PreviouslyJohn Barnette2008-04-282-1/+18
| | | | | | | | | | | | repeated calls to alias_method_chain would cause infinite loops. Signed-Off-By: Michael Koziarski <michael@koziarski.com>
* | 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 ↵David Heinemeier Hansson2008-04-271-3/+5
| | | | (which now apparently is gone)
* Added ActionController::TestCase#rescue_action_in_public! to control whether ↵David Heinemeier Hansson2008-04-272-2/+23
| | | | the action under test should use the regular rescue_action path instead of simply raising the exception inline (great for error testing) [DHH]
* 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
| | | | | | | | | | | | | | If Rails doesn't respond to vendor_rails?, abort with an error asking the user to run 'rake rails:update'. Signed-Off-By: Michael Koziarski <michael@koziarski.com>
| * Remove old :limit removal code from find_initial, logic is now handled in ↵Aliaksey Kandratsenka2008-04-271-1/+1
| | | | | | | | | | | | the preloading and eager loading code. Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Add default options to file_store to make it align with the other cache ↵Michael Koziarski2008-04-261-2/+2
| | | | | | | | | | | | stores. [monki] [#40 state:resolved]
| * Ensure table names are quoted by the association preloading code.Frederick Cheung2008-04-268-10/+83
| | | | | | | | | | | | [#45 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com>
* | 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 ↵David Heinemeier Hansson2008-04-252-0/+18
| | | | bigint depending on the :limit just like PostgreSQL [DHH]
* 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 ↵Sam Granieri2008-04-231-1/+7
| | | | | | state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Make sure member names aren't mistakenly set to nil when providing :path_namesEugene Pimenov2008-04-232-8/+39
| | | | | | [#19 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Fix include? on has_many collections with finder_sql to fall back to Array ↵Joshua Bates2008-04-232-0/+12
| | | | | | include? rather than try to use SQL. [#18 state:resolved]
* Provide data for the key column otherwise adding a unique index will fail. ↵Frederick Cheung2008-04-231-0/+1
| | | | [#30 state:closed]
* Rails Edge info returns the latest git commit hash [#36 state:resolved]Francesc Esplugas2008-04-223-43/+39
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Use schema.rb for all databasesFrederick Cheung2008-04-2243-2928/+432
| | | | | | Move adapter specific schema into their own files Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Fallback to Ruby's pseudo random number generator if the system does not ↵Joshua Peek2008-04-211-1/+6
| | | | have SHA512 installed.
* 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
| | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Introduce ActiveResource::Base.timeout. This allows a timeout to be set on ↵Cheah Chu Yeow2008-04-224-4/+117
| | | | | | the internal Net::HTTP instance ARes uses (default is 60 seconds). Setting a low timeout allows ARes clients to fail-fast in the event of a unresponsive/crashed server, rather than cause cascading failures in your application. Signed-off-by: Michael Koziarski <michael@koziarski.com>
* * Remove default_url_options from mailer generatorCody Fauser2008-04-213-17/+30
| | | | | | * Improve mailer documentation regarding generating URLs * Add no_match to mailer generator to warn contributors about default_url_options Signed-off-by: Joshua Peek <josh@joshpeek.com>
* 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
| | | | This reverts commit eef9002968609a0d8d4a8006aebcd6f18f993f4a.
* 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 ↵Joshua Peek2008-04-212-3/+5
| | | | dependency tests.
* 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
| | | | | Reduce number of instance variables being copied from controller to view. Instead, delegate them to controller instance.
* select_datetime and select_time default to Time.zone.now when ↵gbuesing2008-04-213-2/+22
| | | | config.time_zone is set
* 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 ↵Steven Soroka2008-04-211-6/+6
| | | | | | falling back to the currently logged in user who may or may not have CREATE / DROP privileges and no password. Closes #11564 (trac)
* 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
| | | | | | | | | | | | Get rid of ActionController::Base#view_controller_internals flag and use @@protected_view_variables for storing the list of controller specific instance variables which should be inaccessible inside views.
| * 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 ↵gbuesing2008-04-205-3/+76
|/ | | | TimeWithZone when config.time_zone is set. Introducing Time.current, which returns Time.zone.now if config.time_zone is set, otherwise just returns Time.now
* 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 ↵Frederick Cheung2008-04-211-1/+1
| | | | | | | | versions of sqlite3.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 10:07:27 +0000