Commit Graph

11792 Commits

Author SHA1 Message Date
David Heinemeier Hansson
fee07b9da0 Merge branch 'master' of github.com:rails/rails 2009-12-21 15:50:19 -08:00
David Heinemeier Hansson
cf66d16bdf Its cookie_verifier_secret 2009-12-21 15:49:52 -08:00
Joshua Peek
880688a499 Default route was removed from default route config, patch up failing tests. 2009-12-21 17:47:03 -06:00
Joshua Peek
715dd10961 Less annoying RoutingError message 2009-12-21 17:34:53 -06:00
Joshua Peek
f82e1046f8 reset_session needs to be a real method so flash can override it 2009-12-21 17:29:59 -06:00
Joshua Peek
3e33985e19 Update CI bundler 2009-12-21 17:27:30 -06:00
David Heinemeier Hansson
81c3b0403d Merge branch 'master' of github.com:rails/rails 2009-12-21 15:25:51 -08:00
Jeremy Kemper
bf03ddc636 Missed changelog entry for :inverse_of 2009-12-21 13:18:11 -08:00
David Heinemeier Hansson
fa8849a573 Merge branch 'master' of github.com:rails/rails 2009-12-21 11:28:16 -08:00
David Heinemeier Hansson
f09ad263ca Turn filter_parameter_logging on by default for password and password_confirmation and remove contentless comments 2009-12-20 20:50:25 -08:00
David Heinemeier Hansson
f9a4cf1562 Show the new short-form in an example 2009-12-20 20:45:18 -08:00
David Heinemeier Hansson
3ff9e9ee14 Its now possible to use match 'stuff' => 'what#stuff' instead of using the :to for simple routes 2009-12-20 20:37:36 -08:00
David Heinemeier Hansson
8763b78f89 Merge branch 'master' of github.com:rails/rails 2009-12-20 19:41:05 -08:00
David Heinemeier Hansson
3506cb730b Mark the wild controller route as legacy an comment it out 2009-12-20 19:40:18 -08:00
Joshua Peek
15f95621d5 We don't need AD parse_config 2009-12-20 21:11:42 -06:00
Yehuda Katz
17f66473bc AC::Head now doesn't have an unfulfilled Rendering dependency, and instead works just fine standalone (which means that ConditionalGet also doesn't have a Rendering dependency) 2009-12-20 18:50:54 -08:00
David Heinemeier Hansson
eeda059818 Just a little tidying 2009-12-20 18:37:09 -08:00
David Heinemeier Hansson
91ce8d8b7f Merge branch 'master' of github.com:rails/rails 2009-12-20 18:32:35 -08:00
David Heinemeier Hansson
cf9d6a95e8 Added ActionDispatch::Request#authorization to access the http authentication header regardless of its proxy hiding [DHH] 2009-12-20 18:30:50 -08:00
David Heinemeier Hansson
36c13cc07a Rename RenderOptions to Renderers 2009-12-20 18:15:20 -08:00
Joshua Peek
29c8a43056 Rename RackConvenience => RackDelegation 2009-12-20 20:05:26 -06:00
Joshua Peek
0f8a5c7954 Merge Session stuff into RackConvenience 2009-12-20 20:00:04 -06:00
Yehuda Katz
b4ecb55551 Missing acts_like dependency 2009-12-20 17:38:28 -08:00
David Heinemeier Hansson
9b41e1e4d8 Renamed Redirector to Redirecting (its a module, not a class) 2009-12-20 17:25:13 -08:00
David Heinemeier Hansson
83f4d86a93 Rename the RenderingController module to just plain Rendering 2009-12-20 17:15:31 -08:00
Joshua Peek
bdccffc40e Remove annoying and useless meta comments 2009-12-20 19:04:54 -06:00
Joshua Peek
2e9c775998 Use instance_eval for schema block 2009-12-20 19:04:53 -06:00
Joshua Peek
c0ad3f6cc6 Rename define_schema => schema 2009-12-20 19:04:53 -06:00
Joshua Peek
669c5eec44 Rename SchemaDefinition => Schema 2009-12-20 19:04:53 -06:00
Taryn East
fc9b3e4a45 define_schema for Active Resource
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-12-20 19:04:53 -06:00
Yehuda Katz
33a6bd390a Fixes Dependency bug in ActiveSupport 2009-12-20 17:03:38 -08:00
David Heinemeier Hansson
c06aff0a7e Added cookies.permanent, cookies.signed, and cookies.permanent.signed accessor for common cookie actions [DHH] 2009-12-20 14:33:13 -08:00
Yehuda Katz
e48b4c2dd0 :to => redirect() can take a String using 1.9-style interpolation or proc that takes the path parameters as a Hash 2009-12-20 14:07:32 -08:00
Yehuda Katz
8b4735fbd9 Add active_support/ruby/shim to the default requirements for AP components 2009-12-20 14:06:40 -08:00
Joshua Peek
2419fae092 Pending tests for AD Response 2009-12-17 22:10:37 -06:00
Joshua Peek
3b44f35e24 Don't need response prepare! 2009-12-17 22:10:37 -06:00
David Heinemeier Hansson
44fb54fecd Models with no attributes should just have empty hash fixtures [Sam] (Closes #3563) 2009-12-17 17:53:16 -08:00
David Heinemeier Hansson
fa575973b1 Added alert/notice from 2-3-stable and refactored redirect_to into just living in Redirector [DHH] 2009-12-17 16:37:11 -08:00
David Heinemeier Hansson
2bfa477128 Fix deprecated :vendored_at option 2009-12-17 12:02:19 -08:00
Joshua Peek
b9d4ceb43c Need to lazy realize middleware options so they can be modified in
the environment
2009-12-16 16:12:04 -06:00
Joshua Peek
7217d64f61 Use AbstractController error constants 2009-12-16 16:11:42 -06:00
Joshua Peek
7ee5843c3c Fully expand relative rails framework paths and make sure we aren't
adding any to the load path more than once.
2009-12-16 11:56:51 -06:00
Joshua Peek
1ab35020c1 Hush AMo test suite 2009-12-16 11:05:48 -06:00
Joshua Peek
c4df013852 ARes rake task should not worry about AS being in path 2009-12-16 11:03:40 -06:00
Joshua Peek
e1ee13e5fb Hush ARes test suite 2009-12-16 11:03:13 -06:00
Joshua Peek
1ca567e634 Hush AM test suite 2009-12-16 10:56:10 -06:00
Joshua Peek
ee51ddcc27 Hush AS test suite 2009-12-16 10:52:52 -06:00
Will
bf6af5f719 When passing force_reload = true to an association, don't use the query cache [#1827 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-12-16 10:49:53 -06:00
Carl Lerche
1b27f5c4f7 Add the ability for plugins to set default configuration settings. 2009-12-15 22:13:52 -08:00
Joshua Peek
f0bbc647c2 Procs don't call themselves
Fixes dev mode reloading [#3574 state:resolved]
2009-12-15 10:48:56 -06:00