Jeremy Kemper
9c9da5d927
Merge branch 'master' into erbout
2008-06-05 17:34:14 -07:00
Pratik Naik
1dbfe9766e
Ensure render :file works inside templates
2008-06-05 23:33:10 +01:00
Frederick Cheung
2e0765a003
Make partial counter start from 0.
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-06-05 22:11:40 +01:00
Jeremy Kemper
e7f1556d0e
Merge branch 'master' into erbout
2008-06-05 13:25:33 -07:00
Pratik Naik
df8154c845
Fix that Rails::InfoController tests
2008-06-05 20:41:22 +01:00
Ryan Kinderman
ed0cb91a83
Ensure plugins' rake tasks are loaded before application's rake tasks. [ #259 state:resolved]
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-06-05 12:44:38 +01:00
Joshua Peek
c4d570c2eb
Use CGI::Cookie::parse for request cookies until we officially deprecated CGI.
2008-06-04 22:32:09 -05:00
Joshua Peek
5fe2878973
Renamed StringQuestioneer to StringInquirer.
2008-06-04 15:06:32 -05:00
Joshua Peek
6e85f14817
Namespaced StringQuestioneer under ActiveSupport.
2008-06-04 15:02:51 -05:00
Joshua Peek
1e4fae42d4
Fixed deprecated call to Dependencies in plugin loader test.
2008-06-04 15:00:50 -05:00
Jeremy Kemper
e660055472
Give a nice message if there are duplicate migrations instead of raising a strange insert error
2008-06-04 12:07:03 -07:00
Sean Huber
30a0ebb3eb
Add RJS#page.reload. [ #277 state:resolved]
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-06-04 13:32:53 +01:00
Jeremy Kemper
53bcbfbdc1
Merge branch 'master' into erbout
2008-06-03 22:38:27 -07:00
David Heinemeier Hansson
82e96eb294
Dependencies move to ActiveSupport::Dependencies missed a few spots
2008-06-03 19:19:08 -05:00
David Heinemeier Hansson
885453537e
Merge branch 'master' of git@github.com:rails/rails
2008-06-03 18:12:56 -05:00
David Heinemeier Hansson
edfa195e2a
Fixed Request#remote_ip to only raise hell if the HTTP_CLIENT_IP and HTTP_X_FORWARDED_FOR doesnt match (not just if theyre both present) [Mark Imbriaco, Bradford Folkens]
2008-06-03 18:11:47 -05:00
Gabe da Silveira
025515b234
Fix assert_redirected_to for nested controllers and named routes
...
[#308 state:resolved]
Signed-off-by: Michael Koziarski <michael@koziarski.com>
2008-06-04 11:08:58 +12:00
Michael Koziarski
e3c26e9926
Merge branch 'master' into patches
2008-06-04 11:05:46 +12:00
David Heinemeier Hansson
8afa725f4b
Wrapped Rails.env in StringQuestioneer so you can do Rails.env.development? [DHH]
2008-06-03 17:44:56 -05:00
Steve Purcell
7cfa6ec8a3
Add more standard Hash methods to ActiveSupport::OrderedHash [ #314 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-06-03 14:15:33 -05:00
josevalim
d54d90f2b5
Allow caches_action to accept a layout option [ #198 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-06-03 14:02:51 -05:00
Craig Demyanovich
aa17716688
Callbacks fire before notifying observers [ #230 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-06-03 13:38:00 -05:00
Joshua Peek
a977f3e88e
Fixed ambiguous first argument warning in ArrayExtTest.
2008-06-03 13:35:03 -05:00
Joshua Peek
c08547d226
Namespace Inflector, Dependencies, OrderedOptions, and TimeZone under ActiveSupport [ #238 state:resolved]
2008-06-03 13:32:53 -05:00
Jeremy Kemper
f55ad960d2
Stack @output_buffer for nested rendering
2008-06-03 01:10:00 -07:00
Jeremy Kemper
4d4c8e298f
Don't pass block binding to concat
2008-06-02 21:32:50 -07:00
Jeremy Kemper
0bdb7d353b
Work with @output_buffer instead of _erbout
2008-06-02 21:32:50 -07:00
Jeremy Kemper
933697a5fc
Try replacing _erbout with @output_buffer
2008-06-02 21:32:50 -07:00
David Heinemeier Hansson
da91450e68
Added tests [ #279 state:resolved] (Nicholas Schlueter)
2008-06-02 22:05:27 -05:00
David Heinemeier Hansson
64fea9c45c
Fixed Date#end_of_quarter to not blow up on May 31st [ #289 state:resolved] (Danger)
2008-06-02 22:02:43 -05:00
David Heinemeier Hansson
e7a305f08d
Fixed Base#exists? to check status code as integer [ #299 state:resolved] (Wes Oldenbeuving)
2008-06-02 21:58:42 -05:00
David Heinemeier Hansson
442d2f1032
Fixed that RailsInfoController wasnt considering all requests local in development mode (Edgard Castro) [ #310 state:resolved]
2008-06-02 21:55:42 -05:00
Joshua Peek
92050f6c6f
Ensure Rack processor reads CGI output_cookies for the session cookie.
2008-06-02 21:02:51 -05:00
David Heinemeier Hansson
29641ff05a
Fixed the brokeness from 952ec79bec313e0001adfc8c86f7970448d32db9
2008-06-02 19:00:25 -05:00
David Heinemeier Hansson
4b4aa8f6e0
AR can be disabled, new_rails_defaults.rb should check [ #303 state:resolved] (Jesper Hvirring Henriksen)
2008-06-02 18:43:08 -05:00
David Heinemeier Hansson
a855ab89b7
Added a test for Gzip
2008-06-02 17:42:10 -05:00
Pratik Naik
bd75a722a2
Ensure AR#sum result is typecasted properly
2008-06-02 20:41:11 +01:00
Cheah Chu Yeow
952ec79bec
Faster Hash#slice that doesn't use Enumerable#include?.
...
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2008-06-02 11:47:15 -07:00
Joshua Peek
714d42d1a6
Fixed initializer tests by stubbing out gems dependencies check.
2008-06-02 10:40:01 -05:00
Joshua Peek
185fe2e9cc
In 9c4f003, gem installation quotes versions. Do the same for unpack and update tests to reflect the change.
2008-06-02 09:54:36 -05:00
Marcos Tapajos
14a65cd982
Fixed changelog merge.
...
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-06-02 09:47:53 -05:00
Jonathan Viney
4210d85a3f
Ensure Associations#sum returns 0 when no rows are returned. [ #295 state:resolved]
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-06-02 12:50:44 +01:00
Joshua Peek
a980eb8c77
Added Rack middleware to handle static files.
2008-06-01 13:18:31 -07:00
Ezra Zygmuntowicz
06cb20708b
Added Rack processor
...
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-06-01 11:25:11 -07:00
David Heinemeier Hansson
3282bf3b50
Added SQL escaping for :limit and :offset in MySQL [Jonathan Wiess]
2008-06-01 09:15:11 -07:00
rick
71528b1825
Previously we only added the "lib" subdirectory to the load path when
...
setting up gem dependencies for frozen gems. Now we add the "ext"
subdirectory as well for those gems which have compiled C extensions
as well. [Wincent Colaiuta]
[#268 state:resolved]
2008-05-31 17:22:16 -07:00
rick
6a975d6ca2
fix changelog conflict
2008-05-31 17:15:24 -07:00
rick
72483c0d4c
Add ActiveRecord::Base.sti_name that checks ActiveRecord::Base#store_full_sti_class? and returns either the full or demodulized name. [rick] [ #114 state:resolved]
2008-05-31 17:13:11 -07:00
Jeremy Kemper
ea03b0885c
revert mysql test credential change
2008-05-31 17:07:44 -07:00
David Heinemeier Hansson
cb59c93de0
Merge branch 'master' of git@github.com:rails/rails
2008-05-31 17:03:40 -07:00