github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
10,564 Commits 34 Branches 105 Tags
df45413ea4e524a94045c183fef87c075bcf01fd
Commit Graph

1909 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
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
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
572e0aac80 update bundled version of rack before 2.3 final 2009-03-10 15:05:38 -05: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
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
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
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
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
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
6de83562f9 Force all internal calls to Array#to_sentence to use English [#2010 state:resolved] 2009-02-27 14:22:39 +01:00
Sam Granieri
0a8c003b1e Ruby 1.9 compat: silence a warning about regexp languages 
[#2050 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-02-25 09:38:26 -08:00
Joshua Peek
1b22071b27 Ensure ActiveRecord session store's connections are checked in after each request [#1927 state:resolved] 2009-02-24 11:34:32 -06:00
Matt Jones
b35562f432 correctly handle layouts for AJAX requests and regular js files [#2052 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-24 10:38:07 -06:00
Pratik Naik
53cd102b39 Merge with docrails 2009-02-24 12:29:25 +00:00
Pratik Naik
21b80f8144 Merge commit 'mainstream/master' 2009-02-22 23:52:02 +01:00
Andrew White
3248553d32 Fix requirements regexp for path segments 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1772 state:committed]
 2009-02-22 15:35:22 +13:00
Andrew White
f7a0a394f4 Remove hardcoded number_of_capturesin ControllerSegment to allow regexp requirements with capturing parentheses 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1887 state:committed]
 2009-02-22 15:34:01 +13:00
Sven Fuchs
8c5cc66a83 make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-20 14:19:45 -06:00
Joshua Peek
69c049f5ab Move development mode reloading up the stack to avoid issues with class reloading in middleware 2009-02-20 12:04:57 -06:00
Sven Fuchs
53fe301a42 Lazy evaluate middleware arguments [#2028 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-20 10:50:21 -06:00
Joshua Peek
9702636a08 Lazy evaluate ActionController session store middleware class to pickup custom plugin session stores [#2001 state:resolved] 2009-02-19 21:21:34 -06:00
Pratik Naik
d8f1ee4b41 Merge commit 'mainstream/master' 2009-02-19 21:20:15 +01:00
Joshua Peek
b6e56efe07 Special case in deprecated CGI proxy layer for Mongrel CGI cookies [#1957 state:resolved] 2009-02-16 22:17:54 -06:00
Joshua Peek
460269dcaf Autoload ActionController::Caching::Sweeper constant [#1977 state:resolved] 2009-02-16 14:37:42 -06:00
Joshua Peek
0096eb1555 Removed dead convert_expires! in Response [#1952 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-16 14:18:06 -06:00
Donald Parish
86d8f92282 Fixed http digest authentication to use credentials URI passed from client. [#1848 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-02-16 20:20:23 +01:00
Joshua Peek
238a6bb62d Update bundled rack to fix more parameter parsing issues 2009-02-14 18:23:08 -06:00
Sven Fuchs
0cb020b4d6 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-14 18:22:41 -06:00
thedarkone
3942cb406e Port fast reloadable templates from rails-dev-boost. 2009-02-12 13:04:12 -06:00
Joshua Peek
ff3fb6c5f3 Reapply 0d5b3e6 2009-02-10 13:36:50 -06:00
Joshua Peek
5689e681e9 Update vendored rack 2009-02-10 13:18:13 -06:00
Joshua Peek
0d5b3e6b41 Make sure vendored rack is at the front of the load path 2009-02-10 10:48:54 -06:00
Andrew White
893e9eb995 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-09 14:20:30 -06:00