Commit Graph

3562 Commits

Author SHA1 Message Date
Pratik Naik
b8ad501c91 Merge commit 'mainstream/master' 2009-03-14 13:12:13 +00:00
Joshua Peek
5b025a1d11 Revert 5b7527ca "Failing test for routes with member & requirement" [#2054 state:wontfix] 2009-03-13 17:13:18 -05:00
Joshua Peek
eced3d8c55 Update rack to fix multipart uploads with an empty file [#1945 state:resolved] 2009-03-13 17:13:10 -05:00
Jeremy Kemper
5f1d6465b4 Change naming to match 2.2 so life is easier on plugin developers 2009-03-12 13:32:52 -07:00
Jeremy Kemper
82c6597dc2 Eliminate internal render stack since we only need its head and tail 2009-03-12 12:34:47 -07:00
Mike Gunderloy
d771e7d17f Handle irregular plurals in polymorphic_urls [#2212 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-03-12 17:02:07 +00:00
Pratik Naik
53744c5438 Merge commit 'mainstream/master'
Conflicts:
	actionpack/lib/action_view/helpers/text_helper.rb
	activesupport/lib/active_support/inflector.rb
2009-03-12 15:31:24 +00:00
Donald Parish
be7b64b35a Support MD5 passwords for Digest auth and use session_options[:secret] in nonce [#2209 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-03-12 13:24:54 +00:00
Henrik N
724eb9e612 Fix some typos, including a global "seperator" -> "separator". 2009-03-12 07:29:57 +01:00
Russ Smith
f2c7508bef Update bundled Rack to fix Litespeed compatibility [#2198 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-03-11 12:50:24 -05:00
Mislav Marohnić
fa45540cdb Ensure correct content type is declared after cache hits on actions with string cache keys [#1585 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-03-10 23:31:19 +00:00
Joshua Peek
0a887e2386 check for rack 1.0 gem before falling back to bundled version 2009-03-10 15:09:44 -05:00
Joshua Peek
572e0aac80 update bundled version of rack before 2.3 final 2009-03-10 15:05:38 -05:00
Joshua Peek
8970f8ace5 remove rack gem dependency 2009-03-10 15:02:58 -05:00
Pratik Naik
0464254430 Add a missing CHANGELOG entry 2009-03-10 16:52:40 +00:00
Eugene Pimenov
bdfa733d04 Ensure auto_link doesnt linkify URLs in the middle of a tag [#1523 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-03-10 16:52:21 +00:00
Pratik Naik
df4375d75a Revert "Updated actionpack/CHANGELOG to include enhancements to form option helpers"
No CHANGELOG entries please.

This reverts commit 7fa0a8d7f38a42d2f41a3f4aefc129d7071b0258.
2009-03-10 16:06:21 +00:00
Tekin Suleyman
f1e903aa92 Merge branch 'master' of git://github.com/lifo/docrails 2009-03-10 15:26:59 +00:00
Joshua Peek
224a534400 reset_session should force a new session id to be generated [#2173] 2009-03-09 22:46:03 -05:00
Pratik Naik
1ab84247ca Merge commit 'mainstream/master'
Conflicts:
	railties/guides/files/stylesheets/main.css
	railties/guides/rails_guides/generator.rb
	railties/guides/source/index.erb.textile
2009-03-10 00:33:32 +00:00
Andrew Bloom
90dba00822 Ensure blank path_prefix works as expected [#2122 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-03-09 15:27:13 +00:00
rpheath
1ab2ff58ed Fixed number_to_phone to work with 7 digit numbers [#2176 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-03-09 12:53:44 +00:00
Jeremy Kemper
a3e67a15ed Prototype helpers support the onCreate callback.
[#1074 state:committed]
2009-03-08 13:41:51 -07:00
Jeremy Kemper
1c36172c13 Ruby 1.9 compat: rename deprecated assert_raises to assert_raise.
[#1617 state:resolved]
2009-03-08 13:11:58 -07:00
Yury Kotlyarov
9b8cde41bc Remove duplicate test [#2136 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-03-08 15:50:38 +00:00
Mike Gunderloy
5e0f6214d2 Support OPTIONS verb in route conditions [#1727 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-03-08 12:37:17 +00:00
Tom Stuart
5c87e9addd Ensure shallow routes respects namespace [#1356 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-03-07 22:50:58 +00:00
Joshua Peek
ea8488caef Fixed simplified render with nested models [#2042 state:resolved] 2009-03-07 14:05:18 -06:00
Matt Jones
87e8b16246 fix HTML fallback for explicit templates [#2052 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-03-07 13:32:46 -06:00
Lawrence Pit
77f7d98e38 submit_tag with confirmation and disable_with [#660 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-03-07 13:29:35 -06:00
Dan Barry
45494580d9 Ensure Active Record error related view helpers escape the message [#1280 state:resolved] [Inge Jørgensen, Dan Barry]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-03-07 18:55:19 +00:00
Pratik Naik
272c2d2e9c Ensure assert_select works with XML namespaced attributes [#1547 state:resolved] [Jon Yurek] 2009-03-07 16:13:34 +00:00
Pratik Naik
a0bb8bcb16 Remove unused variable [#1451 state:resolved] [Raphaël Valyi] 2009-03-07 15:53:40 +00:00
Johan Sørensen
c071123b3e Ensure expires_in without a :public key sets the Cache-Control header to private. [#2095 state:resolved]
This fixes a regression introduced in f2a32bd0, which wasn't exposed due to two
test methods having the same name.

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-03-07 12:18:10 +00:00
Tekin Suleyman
7fa0a8d7f3 Updated actionpack/CHANGELOG to include enhancements to form option helpers 2009-03-06 16:46:06 +00:00
Niels Ganser
cb40c761b2 Minor spelling fix 2009-03-06 13:45:26 +01:00
thedarkone
3191535ff0 Fix layouts with absolute paths [#2134 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-03-05 18:49:22 -06:00
Mike Gunderloy
5b7527ca44 Failing test for routes with member & requirement [#2054 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-03-05 18:46:59 -06:00
David Heinemeier Hansson
b1c989f28d Fixed that redirection would just log the options, not the final url (which lead to "Redirected to #<Post:0x23150b8>") [DHH] 2009-03-05 12:22:49 +01:00
David Heinemeier Hansson
dfef3d8b14 Release RC2 today 2009-03-05 11:00:04 +01:00
Joshua Peek
638b3b15a1 Generating routes with optional format segment does not inherit params format [#2043 state:resolved] 2009-03-04 14:37:59 -06:00
Mike Gunderloy
ce56c5daa8 Allow routes with a trailing slash to be recognized
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#2039 state:committed]
2009-03-04 14:27:39 +13:00
Joshua Peek
9b1b88f09c Fixed reset_session for ActiveRecord session store [#2108 state:resolved] 2009-03-03 13:07:03 -06:00
Pratik Naik
5029210914 Use Array.wrap() instead of Array() and handle action_view.cache_template_loading being false 2009-02-28 19:03:41 +00:00
Pratik Naik
8607740a29 Ensure the old behaviour is retained when action_view.cache_template_loading is not set explicitly 2009-02-28 17:42:15 +00:00
Mike Gunderloy
dcd9c7f58e Fix spelling in test name.
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-02-28 15:35:03 +00:00
Gregg Pollack
f2a32bd0de Added ability to pass in :public => true to fresh_when, stale?, and expires_in to make the request proxy cachable [#2095 state:committed]
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2009-02-28 10:33:42 +01:00
David Heinemeier Hansson
7058c1366e So it didnt happen yesterday, but very soon! Just need the final details ironed out 2009-02-28 10:30:49 +01:00
David Heinemeier Hansson
77b0994c78 Prep for RC2 later today 2009-02-27 14:46:23 +01:00
David Heinemeier Hansson
6de83562f9 Force all internal calls to Array#to_sentence to use English [#2010 state:resolved] 2009-02-27 14:22:39 +01:00