Commit Graph

5744 Commits

Author SHA1 Message Date
José Valim
7a7cbab1f4 Merge branch 'master' of github.com:rails/rails 2010-07-24 00:49:16 +02:00
José Valim
76b6136b00 Clean up AM and AC railties. 2010-07-24 00:48:12 +02:00
José Valim
2af8fd2829 Also move asset_path to AbstractController. 2010-07-24 00:47:48 +02:00
Jeroen van Dijk and Josh Kalderimis
affeb51569 Move config_accessor :asset_host from ActionController::Base to AbstractController which fixes issues with asset_host in ActionMailer
Including:
  - Moved mailer objects in separate directory
  - Added two tests for asset_host configuration option
2010-07-24 00:27:25 +02:00
Aaron Patterson
b50635a59f update Rakefiles for RDoc 2.5 2010-07-23 21:11:29 +02:00
Santiago Pastorino
b378b19430 Makes Rakefile activate rdoc >= 2.5.9
Signed-off-by: Xavier Noria <fxn@hashref.com>
2010-07-23 00:04:06 +02:00
Santiago Pastorino
30df88ae06 These tests are trusting in the order of the elements so use OrderedHash instead of Hash 2010-07-21 17:34:43 -07:00
Santiago Pastorino
a1e795f554 options could be of any kind of Hash (Hash, HashWithIndifferentAccess or OrderedHash) this way we keep the properties of the options passed as an argument 2010-07-21 17:34:02 -07:00
Wincent Colaiuta
198975ecee doc: form_for does return output rather than merely evaluate its block 2010-07-22 01:28:31 +02:00
Mislav Marohnić
efdfcf1325 correct typos in Routing examples 2010-07-22 01:28:30 +02:00
Brian Rose
622092d33e Fixed a globbed route issue where slashes were being escaped, causing assert_routing to fail. [#5135 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-07-21 22:07:40 +02:00
Santiago Pastorino
d16c5cc99b Change some missing README -> README.rdoc 2010-07-22 01:47:06 +08:00
Andrew Kaspick
a1a41a3939 remote_function patch with more detailed test
Signed-off-by: wycats <wycats@gmail.com>
2010-07-21 10:04:55 -07:00
José Valim
e13e8dcf44 Use capture instead of yield in link_to_unless.
[#5162 state:resolved]
2010-07-21 15:23:14 +02:00
José Valim
9dfe9fa693 Ensure insert_before in middleware stack raises a meaningful error message [#3679 state:resolved] 2010-07-21 15:17:04 +02:00
José Valim
0a729b0a91 Fix failing railties tests. 2010-07-21 14:16:37 +02:00
José Valim
508fba9e07 Add .rdoc extension to README files. 2010-07-21 12:51:14 +02:00
José Valim
b70062f1e7 Rework a bit README files. 2010-07-21 12:37:05 +02:00
José Valim
f1082bd51e Remove old install.rb files. 2010-07-21 11:56:28 +02:00
José Valim
c565f0060a No need to delegate. Simply include the whole RecordIdentifier module. 2010-07-21 11:46:38 +02:00
Piotr Sarnacki
6807b08099 Moved a few methods from RecordIdentifier to ActiveModel::Naming
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-07-21 11:29:58 +02:00
Piotr Sarnacki
a63566dda8 Moved PolymorphicRoutes to ActionDispatch::Routing
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-07-20 23:12:46 +02:00
José Valim
9df9c4bac0 Add a test for elapsed and require missing benchmark file. 2010-07-20 17:07:18 +02:00
José Valim
51d2db0a63 Add missing require to metal/streaming.rb 2010-07-20 09:56:16 +02:00
Bryan Helmkamp
e466354edb Extract ParameterFilter class from FilterParameters mixin
Signed-off-by: wycats <wycats@gmail.com>
2010-07-19 13:44:43 -07:00
José Valim
c3c349ec3e Remove assert_valid. It was already deprecated on Rails 2.3. 2010-07-19 22:35:17 +02:00
Santiago Pastorino
17600eb435 Remove unused orig_handler and unneeded parentheses 2010-07-20 04:32:08 +08:00
José Valim
b22c11fa53 Add missing entries and tidy up CHANGELOG. 2010-07-19 15:14:26 +02:00
José Valim
70f7ba3e3b There is absolutely no need to use __send__ here. 2010-07-19 14:56:09 +02:00
José Valim
ab6ff85906 No need to create a new module in the previous commit. 2010-07-19 14:50:38 +02:00
Neeraj Singh
33c5689e2d Exceptions from views should be rescued based on the original exception. If a handler for original exception is missing then apply ActiveView::TemplateError
[#2034 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-07-19 14:50:38 +02:00
José Valim
291adcd588 Set session options id to nil is respected and cancels lazy loading. 2010-07-18 12:51:03 +02:00
Ivan Torres
cdfa11409c select :include_blank or :prompt should return escaped string [#5099 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-07-18 11:32:00 +02:00
Neeraj Singh
1f499e6d4c fixing the ternary operation where the logic is very confusing.
[#5136 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-07-18 11:31:54 +02:00
José Valim
e210895ba9 Avoid uneeded queries in session stores if sid is not given. 2010-07-18 11:02:08 +02:00
Nick Quaranto
7aec9f9c02 Removing ActionDispatch::Http::FilterParameters#fitered_parameters alias 2010-07-18 06:04:55 +08:00
Xavier Noria
631b9564d2 Merge remote branch 'docrails/master' 2010-07-17 20:00:48 +02:00
Carlos Antonio da Silva
c09cd192aa Small fix in cookie docs and trailing whitespaces 2010-07-15 18:41:29 -03:00
Santiago Pastorino
fcb230144b Bump up nokogiri, memcache-client, sqlite3-ruby, fcgi, mail and tzinfo 2010-07-15 13:18:47 -07:00
Santiago Pastorino
3952268929 Bump up to rack-mount 0.6.9 and rack-mount-0.6.6.pre removed from action_dispatch vendor 2010-07-15 13:18:44 -07:00
Xavier Noria
6d2e4ee96c Merge remote branch 'docrails/master' 2010-07-13 18:41:09 +02:00
Benjamin Quorning
7e075e6247 Fixed many references to the old config/environment.rb and Rails::Initializer 2010-07-13 13:00:21 +02:00
Miles Egan
d2fae5f78e remove size attribute from tag generated by file_field helper [#5084 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-07-13 08:30:08 +02:00
Santiago Pastorino
d030f830cf Fixes a regression caused by having mapping options controller and action as blank
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-07-12 19:47:28 +02:00
José Valim
3d7e411953 Routes should respect namespace even if action is a regexp and just controller is given to to. 2010-07-12 15:11:53 +02:00
Steven Hancock
1a35b6215f Removed deprecated |map| block argument from routing docs since it is no longer generated in edge Rails config/routes.rb
Didn't touch plugins guide since I'm not too clear on how routes work in plugins.
2010-07-11 23:57:26 -07:00
Xavier Noria
2f04c87855 Merge remote branch 'docrails/master' 2010-07-09 22:08:24 +02:00
Rohit Arondekar
dc364fdc59 API Docs: Fixes to the Routing docs 2010-07-07 22:15:15 -07:00
Jeremy Kemper
81f398b804 Fix setting helpers_path to a string or pathname 2010-07-07 12:03:08 -07:00
Xavier Noria
64c75d6618 Merge remote branch 'docrails/master' 2010-07-07 12:58:46 +02:00