Commit Graph

9778 Commits

Author SHA1 Message Date
Bryan Helmkamp
e2ed1a1ca4 Allow MemCacheStore to be initialized with a MemCache object instead of addresses and options 2009-05-19 10:54:56 -07:00
Chad Woolley
6dc3a6a954 Upgrade CI server to latest RubyGems [#2665 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-19 12:50:26 +02:00
Emilio Tagua
20deb677a2 Add missing models and fixtures [#2673 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-19 12:11:46 +02:00
Yehuda Katz + Carl Lerche
07f733c631 Ported simple benchmarking in new base 2009-05-18 17:33:45 -07:00
Jeremy Kemper
ee5520a0a5 Merge branch 'master' of git@github.com:rails/rails 2009-05-18 15:02:15 -07:00
Jeremy Kemper
41e9414b60 Include acts_as_string? 2009-05-18 15:01:13 -07:00
Emilio Tagua
5463823df3 Remove unnecessary condition and local variable [#2602 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-18 22:46:37 +02:00
Joe Van Dyk
29550cc91f Add ability to get multiple memcached keys at the same time (via MemCacheStore#read_multi).
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2009-05-18 13:43:56 -07:00
Jeremy Kemper
3e2f0800e3 Merge branch 'master' of git@github.com:rails/rails 2009-05-18 13:43:44 -07:00
Ken Collins
87adecfef5 Reimplement Fixtures.identify so that it consistently generates identities across ruby versions.
[#2633 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2009-05-18 13:40:45 -07:00
Luca Guidi
cef76c8af4 Ensure HasManyThroughAssociation#destroy delete orphan records [#2251 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-18 22:30:43 +02:00
Jeremy Kemper
a69b28a8b1 Missing 1.8.7 backport extensions 2009-05-18 13:20:04 -07:00
Pratik Naik
c5e109bbe7 Make sure default_scope#create checks for options[:conditions] [#2181 state:resolved] [James Le Cuirot] 2009-05-18 21:27:42 +02:00
Jeremy Kemper
37453e11e9 Revert "Get AR CI passing again by requiring the entire core_ext"
This reverts commit 8e6a18d867.
2009-05-18 11:55:06 -07:00
Jeremy Kemper
cf6e025a45 Merge branch 'master' of git@github.com:rails/rails 2009-05-18 11:54:51 -07:00
Andy Stewart
5e190ef138 Truncate helper accepts a :separator for a more legible result [#1807 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-18 20:46:19 +02:00
Pratik Naik
195fadbfd3 Ensure HTTP Digest auth uses appropriate HTTP method [#2490 state:resolved] [Steve Madsen] 2009-05-18 16:59:37 +02:00
Emilio Tagua
28f5cfe066 Add missing model and fixtures to finder_test [#2671 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-18 15:58:25 +02:00
Benjamin Floering
27de7f150b Fixed limited eager loading associations with numbers in the name [#2668 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-18 13:56:17 +02:00
Kerry Buckley
49afe81a13 Report errors in 'all project' rake tasks [#2224 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-18 11:13:51 +02:00
rick
e89241c92f load the JSON Backend lazily. If the JSON gem is already loaded, use the JSONGem backend by default. 2009-05-17 19:18:00 -07:00
Brian Lopez
b0de061e7b Allow ParamsParser to parse YAML from the request body IO directly
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-05-17 16:09:28 -05:00
Joshua Peek
01d7acd11d Fix reset_session with ActiveRecord store [#2200 state:resolved] 2009-05-17 14:42:36 -05:00
Mislav Marohnić
b33c0d9832 replace the aaa_create_tables_test hack with loading test database schema in the test helper [#2663 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-05-17 13:51:35 -05:00
Joshua Peek
092089015b Extract generic callbacks middleware from dispatcher 2009-05-17 13:39:55 -05:00
Mike Breen
edc9c226d1 Add tests for assert_template :template
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-17 19:50:00 +02:00
Joshua Peek
8118fca9be Merge Failsafe middleware into ShowExceptions 2009-05-17 12:24:59 -05:00
Joshua Peek
c3319504f0 Rescue hack was supposed to be removed. Some how it crept back in. 2009-05-17 12:24:59 -05:00
Travis Briggs
98eaa2c683 Ensure number_to_human_size does not strip zeros from the end [#1763 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-17 19:02:50 +02:00
Thomas E. Glasgow
e41984c5f7 Simplify filter_chain method implementation [#2327 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-17 18:56:07 +02:00
Chris Kampmeier
4e8c36a741 Implement #many? for NamedScope and AssociationCollection using #size [#1500 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-17 18:56:06 +02:00
Lance Ivy
11bac70078 Ensure auto_link does not ignore multiple trailing punctuations [#2504 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-17 18:56:06 +02:00
Brian Lopez
53dda29f8b Add support for parsing XML and JSON from an IO as well as a string [#2659 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-05-17 10:37:52 -05:00
Mike Gunderloy
344ee681d6 Remove obsolete wiki reference [#2291 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-17 15:15:43 +02:00
Paulo Schneider
34874b3bcd Fix typo in the generated routes.rb [#2433 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-17 15:00:05 +02:00
Jacob Kjeldahl
d6645a5e52 Supply valid ruby-prof parameters [#1804 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-17 14:53:06 +02:00
Daniel Guettler
25724eede9 has_one :through should not create a new association when assigned nil [#698 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-17 14:48:20 +02:00
Pratik Naik
a9e8c4b374 Ensure rake test does not run new base tests as that requires rack/test 2009-05-17 14:31:54 +02:00
Jeffrey Chupp
842dab0c29 Ensure WhiteListSanitizer allows dl tag [#2393 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-17 14:29:47 +02:00
Yehuda Katz
4fa871654d Get Railties passing again 2009-05-16 12:28:25 -07:00
Yehuda Katz
db1bf3650d Fix ActionMailer Symbol#to_proc instance 2009-05-16 12:13:41 -07:00
Yehuda Katz
8e6a18d867 Get AR CI passing again by requiring the entire core_ext
Note that this includes Time and Date; we should
  really figure out what parts of core_ext are really
  required for AR and require just those.
2009-05-16 12:09:25 -07:00
Bryan Helmkamp
59c4d9a5b4 Changelog 2009-05-16 14:18:10 -04:00
Bryan Helmkamp
7f318c3ec5 Instead of checking Rails.env.test? in Failsafe middleware, check env["rails.raise_exceptions"] 2009-05-16 14:15:26 -04:00
Pratik Naik
a6d8ca0f0e Include guides directory in the rails gem 2009-05-16 17:10:04 +02:00
Yehuda Katz + Carl Lerche
5a45446cff Ported Rescuable to new base 2009-05-15 17:49:11 -07:00
Yehuda Katz + Carl Lerche
7e10504bde Refactored AbstractController to provide better hook points for overriding aspects of action dispatching 2009-05-15 15:57:12 -07:00
José Valim
eb021707f5 Allow strings to be sent as collection to select.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
2009-05-15 15:30:17 +12:00
Jeremy Kemper
628110d7ee Active Support dependencies 2009-05-14 17:42:20 -07:00
Yehuda Katz + Carl Lerche
b6bac73b28 Merge commit 'origin/master'
Conflicts:
	actionpack/lib/action_controller/abstract/base.rb
	actionpack/lib/action_controller/routing.rb
2009-05-14 17:38:30 -07:00