Commit Graph

5349 Commits

Author SHA1 Message Date
wycats
8e9df34fa3 Merge branch 'master' of github.com:rails/rails 2010-04-13 14:07:46 -07:00
Stanko Alexander
dc251389d1 Add test case which check content type when rendering rjs partial in html template
Signed-off-by: wycats <wycats@gmail.com>
2010-04-13 13:09:41 -07:00
Anil Wadghule
518891f490 Use correct RUBY_PLATFORM regex for Windows env [#4385 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-04-13 12:39:03 -07:00
David Heinemeier Hansson
4c8af9bf51 Update changelogs for release 2010-04-13 12:14:54 -07:00
wycats
36f3634a6a Add a test that used to fail but is fixed now [#3417 state:resolved] 2010-04-12 21:57:40 -07:00
Craig R Webster
54533d28ef Fix a typo in the documentation. [#4318 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
2010-04-12 21:45:39 -07:00
José Valim
86defed5ad Fix a bug in url generation for generic routes. 2010-04-12 20:23:35 +02:00
José Valim
a8b1ca26d7 Ensure match path, :controller => name works as expected. 2010-04-12 16:49:41 +02:00
José Valim
3eda7cf090 Let capture handle the yielding. 2010-04-12 10:55:43 +02:00
José Valim
3fc609ee41 Fix ActionMailer test broken in 99d5459921 2010-04-12 10:50:27 +02:00
Ryan Bates
e5f392ce8f fields_for returns block result when outside ERB
Signed-off-by: wycats <wycats@gmail.com>
2010-04-11 19:26:00 -07:00
José Valim
1f80b8b04f Merge branch 'master' of gitproxy:rails/rails 2010-04-11 12:07:47 +02:00
Santiago Pastorino
5b89fd07b2 Make namespace work with options[:to] [#4351 state:committed]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-04-11 12:05:43 +02:00
Xavier Noria
fb4b454de1 your beloved typo only spotted in github diff no matter how careful you were before pushing 2010-04-11 02:56:19 -07:00
Xavier Noria
9111f4268b second pass to the intro rdoc of form_helper.rb 2010-04-11 02:50:07 -07:00
Xavier Noria
b7d8f5a329 removes some duplication in previous edit 2010-04-10 16:53:25 -07:00
Xavier Noria
ef2ec071de makes a pass to the intro rdoc of form_helper.rb, will revise form_for tomorrow 2010-04-10 16:49:39 -07:00
Santiago Pastorino
95d13cca7b form_for :as rubydoc and tidy up a bit the form_for doc 2010-04-10 15:32:20 -07:00
wycats
381f877bbb Revert "Revert "Use path_names, not resource_path_names, consistently""
This reverts commit d3ec4b1ba6.
2010-04-10 15:54:29 -04:00
José Valim
ee309d506c Update versions (otherwise you install a gem from source as beta3 but internally it's beta2) and update CHANGELOG. 2010-04-10 12:17:34 +02:00
José Valim
55d159b25d Remove error_messages_for data from locale. 2010-04-10 11:50:09 +02:00
José Valim
ece157e950 Move verification to a plugin as well: http://github.com/rails/verification.git 2010-04-10 11:47:20 +02:00
José Valim
cd79a46174 Remove input, form, error_messages_for and error_message_on from the framework. If you think you will miss them, feel free to use the dynamic_form plugin available at http://github.com/rails/dynamic_form 2010-04-10 10:53:05 +02:00
José Valim
d3ec4b1ba6 Revert "Use path_names, not resource_path_names, consistently"
Breaks tests on Ruby 1.8.7.
This reverts commit 13bbf98d85.
2010-04-10 10:47:40 +02:00
wycats
13bbf98d85 Use path_names, not resource_path_names, consistently 2010-04-10 02:56:28 -04:00
Jeremy Kemper
7353fc1595 Dial back from 'namespace :controller => ...' to 'scope :module => ...' 2010-04-09 23:09:15 -07:00
Jeremy Kemper
561d9eff0c Add test showing root match in path namespace 2010-04-09 22:12:06 -07:00
Jeremy Kemper
ac0280c39d Routes can be selectively namespaced by path or controller module 2010-04-09 21:48:35 -07:00
Santiago Pastorino
13e00ce606 fix stack trace lines on class_eval
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-04-09 21:28:49 +02:00
Xavier Noria
8b2266a8da image_path -> path_to_image in a couple of places, plus motivation for path_to_image in rdoc 2010-04-09 11:10:26 -07:00
David Heinemeier Hansson
38f1d3543e Stray carrier returns 2010-04-09 11:05:26 -07:00
Jeremy Kemper
19e6006636 Layout contents are html-safe 2010-04-09 09:14:02 -07:00
Xavier Noria
773b2f0c9b adds an entry for #favicon_link_tag in AP's CHANGELOG 2010-04-09 04:06:14 -07:00
Jeremy Kemper
4691c696b0 Expect an incompatible encoding exception when a template with a magic comment renders a partial without one and its source encoding doesn't match the default external encoding 2010-04-08 20:22:07 -07:00
Jeremy Kemper
bd2bf5390d Expect an incompatible encoding exception when a template doesn't have a magic comment and its source encoding doesn't match the default external encoding 2010-04-08 19:27:39 -07:00
Xavier Noria
fd7202a756 adds #favicon_link_tag back, rdoc explains why it is useful, and how to get a link for Mobile Safari with it 2010-04-08 18:13:23 -07:00
Carl Lerche
99d5459921 Fixed that default locale templates should be used if the current locale template is missing [DHH] 2010-04-08 18:11:26 -07:00
Michael Koziarski
82514c2897 Add accessors for request and response so tests don't have to mess with internal ivars 2010-04-09 11:30:39 +12:00
David Heinemeier Hansson
5f808b865c Consistently use lowercase instead of camelCase for all JS class names in Rails 2010-04-08 12:17:46 -07:00
David Heinemeier Hansson
00ee9b3369 Revert "adds #favicon_link_tag and #apple_touch_icon_link_tag" -- these tags are too specific.
This reverts commit 6891f46d10, ec8610cfdc, and  d18ff1b7ef.
2010-04-08 11:49:34 -07:00
Jeremy Kemper
e7f0d37c91 Remove superfluous condition 2010-04-08 11:38:25 -07:00
Jeremy Kemper
ab5aa55cb8 Merge branch 'master' of github.com:rails/rails 2010-04-08 10:25:13 -07:00
José Valim
4e92134dfa Fix a bug in ActionDispatch::Static where Rails cannot find assets if started in another directory which is not the RAILS_ROOT. 2010-04-08 12:52:37 +02:00
Xavier Noria
6891f46d10 adds #favicon_link_tag and #apple_touch_icon_link_tag to AP's CHANGELOG 2010-04-07 15:07:07 -07:00
Xavier Noria
ec8610cfdc adds a default source to #apple_touch_icon_link_tag 2010-04-07 13:20:52 -07:00
Xavier Noria
d18ff1b7ef new helpers #favicon_link_tag and #apple_touch_icon_link_tag 2010-04-07 13:04:52 -07:00
Jeremy Kemper
3957d44fd1 Use request.body IO and rewind, if possible 2010-04-07 11:42:07 -07:00
Joshua Peek
086392492c Remove #size call on rack input io 2010-04-07 11:41:14 -07:00
José Valim
149d13e1f0 Move the error raising to api_behavior. 2010-04-07 16:18:13 +02:00
José Valim
eb063538bd Use config.filter_parameters on in-browser request dump. [#4335 state:resolved] 2010-04-07 01:42:51 +02:00