Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed response logging to use length instead of the entire thing (seangeo) ↵ | David Heinemeier Hansson | 2008-04-29 | 2 | -1/+3 |
| | | | | [#27 state:resolved] | ||||
* | Fixed that change_column should be able to use :null => true on a field that ↵ | David Heinemeier Hansson | 2008-04-29 | 2 | -1/+10 |
| | | | | formerly had false [Nate Wiger] [#26 state:resolved] | ||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-04-29 | 7 | -16/+60 |
|\ | |||||
| * | Add missing clear method to memory_store | Tobias Lütke | 2008-04-29 | 1 | -0/+4 |
| | | |||||
| * | Allow access to mem_cache_store's stats hash | Tobias Lütke | 2008-04-29 | 1 | -0/+4 |
| | | |||||
| * | Implement increment/decrement on cache storage engines, using read/write by ↵ | Tobias Lütke | 2008-04-29 | 3 | -3/+37 |
| | | | | | | | | default and using atomic command on memcache | ||||
| * | By default rails will update keys in memcached when using Rails.cache.write. ↵ | Tobias Lütke | 2008-04-29 | 1 | -6/+5 |
| | | | | | | | | Use :unless_exist => true flag to prevent existing keys from being overwritten. | ||||
| * | Clarify confusing ActionController::Base.allow_concurrency flag. | Jeremy Kemper | 2008-04-28 | 1 | -3/+4 |
| | | |||||
| * | Note that allow_concurrency = true means you need to ↵ | Jeremy Kemper | 2008-04-28 | 1 | -1/+3 |
| | | | | | | | | verify_active_connections! to clear out connections assigned to stale threads. | ||||
| * | run prepare callbacks after after_initialize blocks so config.to_prepare ↵ | Jeremy Kemper | 2008-04-28 | 1 | -3/+3 |
| | | | | | | | | actually works | ||||
* | | Default integer need not specify a limit [#20371 state:resolved] (matthuhiggins) | David Heinemeier Hansson | 2008-04-29 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-04-28 | 2 | -5/+15 |
|\ | |||||
| * | Ruby 1.9 compat: force assert_select text encoding to the encoding of the ↵ | Jeremy Kemper | 2008-04-28 | 2 | -5/+15 |
| | | | | | | | | regexp it's matching against. | ||||
| * | Revert alias_method_chain exceptions as they broke aliasing class methods. | Michael Koziarski | 2008-04-28 | 2 | -18/+1 |
| | | | | | | | | This reverts commit be48cad9a41ebf88ae19f2381a57917d532734c9. | ||||
| * | Make alias_method_chain complain about duplicate aliases. Previously | John Barnette | 2008-04-28 | 2 | -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/last | David Heinemeier Hansson | 2008-04-28 | 3 | -1/+10 |
|/ | |||||
* | Fixed that BenchmarkHelper should use controller.logger instead of @logger ↵ | David Heinemeier Hansson | 2008-04-27 | 1 | -3/+5 |
| | | | | (which now apparently is gone) | ||||
* | Added ActionController::TestCase#rescue_action_in_public! to control whether ↵ | David Heinemeier Hansson | 2008-04-27 | 2 | -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/rails | David Heinemeier Hansson | 2008-04-27 | 11 | -13/+90 |
|\ | |||||
| * | Be friendlier when upgrading apps with an old boot.rb. | John Barnette | 2008-04-28 | 1 | -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 Kandratsenka | 2008-04-27 | 1 | -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 Koziarski | 2008-04-26 | 1 | -2/+2 |
| | | | | | | | | | | | | stores. [monki] [#40 state:resolved] | ||||
| * | Ensure table names are quoted by the association preloading code. | Frederick Cheung | 2008-04-26 | 8 | -10/+83 |
| | | | | | | | | | | | | [#45 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | | Changing "and" to && whereever I catch it | David Heinemeier Hansson | 2008-04-27 | 1 | -1/+1 |
|/ | |||||
* | Added that the MySQL adapter should map integer to either smallint, int, or ↵ | David Heinemeier Hansson | 2008-04-25 | 2 | -0/+18 |
| | | | | bigint depending on the :limit just like PostgreSQL [DHH] | ||||
* | Pass template object to Handler#compile | Pratik Naik | 2008-04-24 | 4 | -4/+4 |
| | |||||
* | Use .gitignore as the convention for dummy file names. | Joshua Peek | 2008-04-24 | 6 | -0/+0 |
| | |||||
* | Fixes a subtle bug when using symbols for key definitions in habtm associations | David Dollar | 2008-04-23 | 2 | -3/+32 |
| | |||||
* | preventing generated documentation from being picked up by git. [#37 ↵ | Sam Granieri | 2008-04-23 | 1 | -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_names | Eugene Pimenov | 2008-04-23 | 2 | -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 Bates | 2008-04-23 | 2 | -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 Cheung | 2008-04-23 | 1 | -0/+1 |
| | | | | [#30 state:closed] | ||||
* | Rails Edge info returns the latest git commit hash [#36 state:resolved] | Francesc Esplugas | 2008-04-22 | 3 | -43/+39 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Use schema.rb for all databases | Frederick Cheung | 2008-04-22 | 43 | -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 Peek | 2008-04-21 | 1 | -1/+6 |
| | | | | have SHA512 installed. | ||||
* | Don't require generator_test_helper in RailsGeneratorTest. | Joshua Peek | 2008-04-21 | 1 | -3/+12 |
| | |||||
* | Add .empty files to empty directories so git preserves them. | Joshua Peek | 2008-04-21 | 6 | -0/+0 |
| | |||||
* | Rescue from Timeout::Error in ActiveResource::Connection. | Cheah Chu Yeow | 2008-04-22 | 3 | -1/+32 |
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Introduce ActiveResource::Base.timeout. This allows a timeout to be set on ↵ | Cheah Chu Yeow | 2008-04-22 | 4 | -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 generator | Cody Fauser | 2008-04-21 | 3 | -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 Peek | 2008-04-21 | 4 | -32/+32 |
| | |||||
* | Revert "Update plugin loading tests to reflect changes in plugin fixtures." | Joshua Peek | 2008-04-21 | 3 | -79/+86 |
| | | | | This reverts commit eef9002968609a0d8d4a8006aebcd6f18f993f4a. | ||||
* | Update plugin loading tests to reflect changes in plugin fixtures. | Joshua Peek | 2008-04-21 | 3 | -86/+79 |
| | |||||
* | Gem dependencies don't require a version. Also fixed up failing gem ↵ | Joshua Peek | 2008-04-21 | 2 | -3/+5 |
| | | | | dependency tests. | ||||
* | Mock RailsFCGIHandler and Dispatcher to stop mocha deprecation warnings. | Joshua Peek | 2008-04-21 | 1 | -6/+24 |
| | |||||
* | Alias Object#instance_variable_names to Object#instance_variables for Ruby 1.8.x | Pratik Naik | 2008-04-21 | 1 | -2/+6 |
| | |||||
* | Delegate ivars to controller instead of copying | Pratik Naik | 2008-04-21 | 4 | -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 ↵ | gbuesing | 2008-04-21 | 3 | -2/+22 |
| | | | | config.time_zone is set | ||||
* | datetime_select defaults to Time.zone.now when config.time_zone is set | gbuesing | 2008-04-21 | 3 | -1/+39 |
| | |||||
* | Use the rails user when creating and dropping the database rather than ↵ | Steven Soroka | 2008-04-21 | 1 | -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) |