github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-05 19:55:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,284 Commits 34 Branches 105 Tags
2ecec6052f7f290252a9fd9cc27ec804c7aad36c
Commit Graph

8284 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Stuart
2ecec6052f Make inheritance of map.resources :only/:except options behave more predictably 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-11-14 12:26:43 +01:00
hiroshi
94d6716324 Make polymorphic_url compact given array [#1317 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-11-14 12:07:52 +01:00
David Heinemeier Hansson
ff4ccb8334 Revert "Move fixtures settings from AR::TestCase to railties test_help" -- it broke all the tests! 
This reverts commit 9a88ab64bb.
 2008-11-14 12:01:26 +01:00
Amos King
db7daa04b8 Fix typo in pool_conections_test [#1350 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-11-14 11:54:05 +01:00
Chris Wanstrath
334178722b Properly check silence_spec_warnings class variable [#1372 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-11-14 11:49:30 +01:00
Jeremy Kemper
9a88ab64bb Move fixtures settings from AR::TestCase to railties test_help 2008-11-13 19:09:23 -08:00
Hongli Lai (Phusion)
4e9abdd7f1 Tag helper should output an attribute with the value 'false' instead of omitting the attribute, if the associated option is false but not nil. 2008-11-13 21:55:58 +01:00
Tom Stuart
4c09210244 Fix map.resources to always generate named routes if they're needed 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-11-13 17:49:09 +01:00
Ken Collins
57d795bad4 Make sure any Fixnum returned by a DB sum is type cast to a Float before standard converstion to a BigDecimal [#8994 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-11-13 10:45:57 -06:00
gbuesing
f857da4faf Merge branch 'master' of git@github.com:rails/rails 2008-11-13 09:04:24 -06:00
gbuesing
020a411304 TimeZone: fix base offset for Sri Jayawardenepura. Anchor tests for zone offsets to more current date 2008-11-13 09:04:06 -06:00
Michael Koziarski
f1ad8b48aa Instead of overriding html_types, base the verification on browser_generated_types. 
Also Deprecate the old unverifiable types.

[#1145 state:committed]
 2008-11-13 11:23:34 +01:00
rick
00c46b5eeb fix two MimeType failing test cases 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-11-13 11:23:34 +01:00
Jeff Cohen
fbbcd6f29a Changed request forgery protection to only worry about HTML-formatted content requests. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-11-13 11:23:21 +01:00
Phil Ross
02df503d3b TimeZone: Caracas GMT offset changed to -4:30 [#1361 state:resolved] 2008-11-12 20:30:00 -06:00
Tom Stuart
44a3009ff0 Add :only/:except options to map.resources 
This allows people with huge numbers of resource routes to cut down on the memory consumption caused by the generated code.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1215 state:committed]
 2008-11-12 12:57:58 +01:00
Joel Chippindale
c65075feb6 Fixed method_missing for ActionMailer so it no longer matches methods where deliver or create are not a suffix [#1318 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-11-11 09:46:29 -06:00
Joel Chippindale
a62e9e90d8 Fix for ActionMailer::Base.method_missing so that it raises NoMethodError when no method is found [#1330 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-11-11 09:46:29 -06:00
Frederick Cheung
78a18392e1 Remove redundant uniq 2008-11-11 11:22:13 +01:00
Jeremy Kemper
cbb38bbdba Only track new constant definitions when we're reloading dependencies 2008-11-10 22:21:09 -08:00
Jeremy Kemper
278b6cd952 Eliminate excess Regexp creation due to capture counting 2008-11-10 22:21:09 -08:00
Jeremy Kemper
5db9f9b3ad Pare down object creation during route building 2008-11-10 22:21:09 -08:00
Joshua Peek
335a315240 Add simple case when DB calculations returns 0 instead of 0.0 [#1346 state:resolved] 2008-11-10 14:16:43 -06:00
Jeremy Kemper
a6d6a1c9ac Move sshpublisher require into the rake tasks that use it so ruby 1.9 and macruby don't need the rake gem installed 2008-11-08 18:58:08 -05:00
Pratik Naik
5cc27f2b03 Add some basic controller logging tests 2008-11-08 18:45:19 +05:30
Jeremy Kemper
dd77733f2f Timeout the connection pool monitor on ruby 1.8 only 2008-11-08 00:27:18 -05:00
Jeremy Kemper
7c73518ef7 Merge branch 'master' of git@github.com:rails/rails 2008-11-07 21:54:18 -05:00
Jeremy Kemper
0be5bc3f59 Work around ruby 1.9 segfault 2008-11-07 21:50:39 -05:00
Ken Collins
a7f920f674 If average value from DB is 0, make sure to convert it to a 0.0 float before calling #to_d on it [#1346 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-11-07 20:39:06 -06:00
Jeremy Kemper
425382d95f Don't worry about attribute ordering 2008-11-07 21:21:10 -05:00
Jeremy Kemper
07fe3370f8 Check whether last arg is a Hash instead of duck-typing against [] 2008-11-07 21:20:26 -05:00
Jeremy Kemper
aaa2abf73f Use delete if the rhs is nil 2008-11-07 21:19:02 -05:00
Jeremy Kemper
1767c4b2da Merge branch 'master' of git@github.com:rails/rails 2008-11-07 19:49:15 -05:00
Pratik Naik
d20955f889 Don't leave open dangling connections in development mode. [#1335 state:resolved] 2008-11-08 04:04:32 +05:30
Nick Sieger
529c271699 Simplify dispatcher callbacks to eliminate unnecessary stale thread purging. [Nick Sieger, Pratik Naik] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-11-08 03:49:54 +05:30
Rich Manalang
d3ec1d3c22 auto_link view helper was failing on URLs with colons after a query param 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1341 state:committed]
 2008-11-07 19:33:18 +00:00
Tekin Suleyman
32a5cfcd7f Added tests for HABTM associations with counter_sql 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1102 state:committed]
 2008-11-07 07:50:30 +00:00
Tekin Suleyman
26978e3ce8 Added :counter_sql as a valid key for habtm associations 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-11-07 07:50:23 +00:00
Michael Koziarski
9d4337ea13 Revert commit which breaks all the tests. 
This reverts commit 8adb79b9b5.

Conflicts:

	activerecord/CHANGELOG
 2008-11-07 07:31:59 +00:00
Jeremy Kemper
983dc80787 Don't shadow local with black arg 2008-11-07 01:08:59 -05:00
Jeremy Kemper
66d4b55899 Fix indentation mismatch 2008-11-07 01:08:21 -05:00
Jeremy Kemper
b5291ed0f1 Mark utf-8 encoding 2008-11-07 01:01:04 -05:00
Joshua Peek
77697e0335 Fix memory leak issue in ActiveRecord scoped_methods 2008-11-06 17:10:16 -06:00
Luca Guidi
4ccbc5dffb Increment the version of our modified memcache_client code to prevent users with the gem installed not seeing our changes. 
The changes will be submitted upstream.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1239 state:committed]
 2008-11-06 19:59:02 +00:00
Aliaksey Kandratsenka
099f10679e Don't eval recognize_optimized use __FILE__ and __LINE__ in the optimised recognition code. 
It produces meaningless line numbers.  This also easily produces line numbers greater than recognition_optimization.rb have, which causes rcov to trash memory outside of it's coverage counting arrays.

[#1319 state:committed]
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-11-06 19:52:44 +00:00
Michael Koziarski
af5b304a40 Fix stupid typo 2008-11-06 18:52:02 +00:00
Grant Hollingworth
732c724df6 Turn on STARTTLS if it is available in Net::SMTP (added in Ruby 1.8.7) and the SMTP server supports it [#1336 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-11-06 13:07:16 +01:00
David Heinemeier Hansson
6406a87eed Fixed the sanitize helper to avoid double escaping already properly escaped entities [#683 state:committed] 2008-11-06 13:03:19 +01:00
David Heinemeier Hansson
a358d87e16 Fixed the sanitize helper to avoid double escaping already properly escaped entities [#683 state:committed] 2008-11-06 13:02:32 +01:00
David Heinemeier Hansson
077773257b Stop logging SHOW FIELDS and SET SQL_AUTO_IS_NULL=0 for the MysqlAdapter as they only clutter up the log and offer no value [DHH] 2008-11-06 12:59:17 +01:00