Commit Graph

6840 Commits

Author SHA1 Message Date
David Heinemeier Hansson
926f4648f0 Made the location of the routes file configurable with config.routes_configuration_file (Scott Fleckenstein) [#88 state:resolved] 2008-05-01 17:26:31 -05:00
Jeremy Kemper
e931394d09 Fix failing associate_with_create tests inserting null first_name 2008-05-01 13:53:10 -07:00
David Heinemeier Hansson
8e8a8b55b9 Merge branch 'master' of git@github.com:rails/rails 2008-05-01 15:41:34 -05:00
Jeremy Kemper
c699a4daf1 Ruby 1.9 compat: compatibility wrapper for new Module#const_defined? behavior 2008-05-01 13:34:31 -07:00
David Heinemeier Hansson
ab4d455d6d Added missing files 2008-05-01 15:03:16 -05:00
Hongli Lai (Phusion
1f2a4b37ac Prevent AssetTagHelper from crashing if RAILS_ROOT is not defined. Fixes compatibility with Passenger. [#84 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2008-05-01 12:45:03 -07:00
David Heinemeier Hansson
e2af713d1c Merge branch 'master' of git@github.com:rails/rails 2008-05-01 14:32:50 -05:00
Steven Soroka
9c20391bbe best solution?
Signed-off-by: Steven Soroka <ssoroka78@gmail.com>
2008-05-01 14:22:55 -05:00
Pratik Naik
74436d2203 Fixed render :template for templates in top level of view path. [#54 state:resolved] 2008-05-01 10:21:46 +01:00
David Heinemeier Hansson
6f20efdaf7 Fixed AssociationsPreload such that it doesnt require foreign keys to be integers (fcheung) [#33 state:resolved] 2008-04-30 23:30:50 -05:00
David Heinemeier Hansson
1eb686a0e5 Cheaper Dependencies#log_call to resolve irritating error message w/ rake db:create (Sven) [#56 state:resolved] 2008-04-30 23:20:59 -05:00
David Heinemeier Hansson
dd120ede53 Added block-setting of attributes for Base.create like Base.new already has (Adam Meehan) [#39 state:resolved] 2008-04-30 23:14:32 -05:00
Kevin Glowacz
c83f75812e Fixed labels that have a bracketed name and an index [#68 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-04-30 17:21:18 -05:00
Joshua Peek
96d9691e71 FormHelper#label_tag accepts :for option [encoded] [#38 state:resolved] 2008-04-30 17:14:28 -05:00
Rhett Sutphin
b4c33711c5 Fixed fixture caching with prefixed or suffixed tables.
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-04-30 16:59:22 -05:00
David Heinemeier Hansson
c353794dff Fixed that pessimistic locking you reference the quoted table name (Josh Susser) [#67 state:resolved] 2008-04-30 15:04:08 -05:00
David Heinemeier Hansson
5cef8bcc54 Forgot these 2008-04-30 15:00:59 -05:00
David Heinemeier Hansson
d327496ab7 Fixed tests (and the weird assumption that no logger would mean that the code wasnt run) 2008-04-30 15:00:15 -05:00
David Heinemeier Hansson
56861af733 Added test for has_one partial rendering (keeran) [#43 state:resolved] 2008-04-30 14:59:24 -05:00
David Heinemeier Hansson
a3da293b33 Fixed render :partial => @collection.named_scope (nkallen) [#61 state:resolved] 2008-04-30 14:42:44 -05:00
Frederick Cheung
a6cca5d1fc Ensure postgresql tests work when starting from scratch. 2008-04-30 21:54:54 +12:00
David Heinemeier Hansson
874603ce8d Change tests against all scope to base scope as all is now used as a finder alias 2008-04-30 00:25:52 -05:00
David Heinemeier Hansson
1282ddaadc Fixed tabs to spaces [#47 state:resolved] 2008-04-29 17:23:50 -05:00
David Heinemeier Hansson
869d731cca Fixed response logging to use length instead of the entire thing (seangeo) [#27 state:resolved] 2008-04-29 17:16:36 -05:00
David Heinemeier Hansson
10ef65a3b0 Fixed that change_column should be able to use :null => true on a field that formerly had false [Nate Wiger] [#26 state:resolved] 2008-04-29 16:52:52 -05:00
David Heinemeier Hansson
5514baf63d Merge branch 'master' of git@github.com:rails/rails 2008-04-29 16:43:47 -05:00
David Heinemeier Hansson
0780563ae7 Default integer need not specify a limit [#20371 state:resolved] (matthuhiggins) 2008-04-29 16:43:23 -05:00
Tobias Lütke
5be5305877 Add missing clear method to memory_store 2008-04-29 16:34:01 -04:00
Tobias Lütke
09517e3aea Allow access to mem_cache_store's stats hash 2008-04-29 15:28:24 -04:00
Tobias Lütke
fef82759ff Implement increment/decrement on cache storage engines, using read/write by default and using atomic command on memcache 2008-04-29 15:12:47 -04:00
Tobias Lütke
9f07b1edcd By default rails will update keys in memcached when using Rails.cache.write. Use :unless_exist => true flag to prevent existing keys from being overwritten. 2008-04-29 14:57:21 -04:00
Jeremy Kemper
bfb54aefa6 Clarify confusing ActionController::Base.allow_concurrency flag. 2008-04-28 22:10:19 -07:00
Jeremy Kemper
1c66ece244 Note that allow_concurrency = true means you need to verify_active_connections! to clear out connections assigned to stale threads. 2008-04-28 22:05:06 -07:00
Jeremy Kemper
90f6062f7d run prepare callbacks after after_initialize blocks so config.to_prepare actually works 2008-04-28 12:02:50 -07:00
David Heinemeier Hansson
9a80e97d58 Merge branch 'master' of git@github.com:rails/rails 2008-04-28 13:29:23 -05:00
David Heinemeier Hansson
0a6980f2dc Let Base.all use conditions etc like first/last 2008-04-28 13:27:52 -05:00
Jeremy Kemper
642bcd2d01 Ruby 1.9 compat: force assert_select text encoding to the encoding of the regexp it's matching against. 2008-04-28 10:52:23 -07:00
Michael Koziarski
8af98c3f81 Revert alias_method_chain exceptions as they broke aliasing class methods.
This reverts commit be48cad9a41ebf88ae19f2381a57917d532734c9.
2008-04-28 16:54:09 +12:00
John Barnette
be48cad9a4 Make alias_method_chain complain about duplicate aliases. Previously
repeated calls to alias_method_chain would cause infinite loops.

Signed-Off-By: Michael Koziarski <michael@koziarski.com>
2008-04-28 16:23:46 +12:00
David Heinemeier Hansson
850aba5473 Fixed that BenchmarkHelper should use controller.logger instead of @logger (which now apparently is gone) 2008-04-27 22:46:19 -05:00
David Heinemeier Hansson
dc2d693014 Added ActionController::TestCase#rescue_action_in_public! to control whether the action under test should use the regular rescue_action path instead of simply raising the exception inline (great for error testing) [DHH] 2008-04-27 19:42:13 -05:00
David Heinemeier Hansson
027f0f822f Merge branch 'master' of git@github.com:rails/rails 2008-04-27 17:16:05 -05:00
David Heinemeier Hansson
162c7c1908 Changing "and" to && whereever I catch it 2008-04-27 17:15:50 -05:00
John Barnette
7f4171da5e Be friendlier when upgrading apps with an old boot.rb.
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>
2008-04-28 09:16:13 +12:00
Aliaksey Kandratsenka
361aaa04ef Remove old :limit removal code from find_initial, logic is now handled in the preloading and eager loading code.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
2008-04-27 20:01:05 +12:00
Michael Koziarski
f3fd44f76b Add default options to file_store to make it align with the other cache stores. [monki]
[#40 state:resolved]
2008-04-26 12:21:36 +12:00
Frederick Cheung
44d2142352 Ensure table names are quoted by the association preloading code.
[#45 state:resolved]

Signed-off-by: Michael Koziarski <michael@koziarski.com>
2008-04-26 12:14:50 +12:00
David Heinemeier Hansson
a37546517d Added that the MySQL adapter should map integer to either smallint, int, or bigint depending on the :limit just like PostgreSQL [DHH] 2008-04-25 16:33:00 -05:00
Pratik Naik
1959db3246 Pass template object to Handler#compile 2008-04-24 16:58:09 +01:00
Joshua Peek
a0748848b6 Use .gitignore as the convention for dummy file names. 2008-04-24 09:20:04 -05:00