github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-12 23:25:00 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,255 Commits 34 Branches 105 Tags
425382d95fbc93efde52c7a1c369f3fbcba70b2e
Commit Graph

8255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Heinemeier Hansson
8adb79b9b5 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 10:00:15 +01:00
David Heinemeier Hansson
55707da1a1 Dont bother logging the parameters hash if there are no parameters 2008-11-06 09:59:11 +01:00
Pratik Naik
0832bc63f4 Make sure ActiveRecord::Base.connected? doesn't raise an exception for defined connections 2008-11-06 01:29:09 +05:30
Pratik Naik
396d599e24 Update guides from docrails 2008-11-06 01:10:30 +05:30
Wes Oldenbeuving
32089cbcc9 Ensure ActiveRecord::ConnectionPool.connected? handles undefined connections. [#936 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-11-06 00:24:09 +05:30
Vladimir Dobriakov
5fad229e43 Fixed that FormTagHelper generates illegal html if name contains e.g. square brackets [#1238 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-11-04 18:24:52 +01:00
Bernardo de Pádua
b2cd318c2e Fix regression bug that made date_select and datetime_select raise a Null Pointer Exception when a nil date/datetime was passed and only month and year were displayed [#1289 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-11-04 18:15:54 +01:00
David Heinemeier Hansson
a909eecbbd Dont log the _method attribute either. Its already available in the header 2008-11-04 18:14:29 +01:00
David Heinemeier Hansson
b29f95ed9a Dont log the _method attribute either. Its already available in the header 2008-11-04 18:12:32 +01:00
Pratik Naik
18bf7b421d Remove unused debug_routes 2008-11-02 23:23:19 +05:30
Pratik Naik
934f98e4cf Dont dup params twice when filter_parameters is present 2008-11-02 23:19:44 +05:30
Pratik Naik
aba1d77f38 Check first for git repository before using git branch 2008-11-02 19:36:56 +05:30
Pratik Naik
be1beb1a2d Dont document internals 2008-11-02 18:36:14 +05:30
Pratik Naik
dc37fdc480 Merge docrails. Remove unnecessary files. 2008-11-02 18:13:54 +05:30
Michael Koziarski
8a53e258e5 Backwards compatibility fixes for relative_url_root 
* Make the old deprecated relative_url_root still set the value as it's still used by mongrel
* Set the default from the ENV value when the file is required, not at runtime.
 2008-11-02 13:12:48 +01:00
Pratik Naik
b047929c14 Merge with docrails 2008-11-02 04:02:40 +05:30
Tom Lea
5a02f0bccf Cleaned up route optimisation guard condition generation code as it was getting a little messy. 
Add additional condition to handle the case where default_url_options is only defined in the controller, not the view.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-11-01 19:06:25 +01:00
Matt Jones
01433af6a5 Make refresh_specs more resilient. Always add vendor/gems to gem search path. Use Gem.clear_paths to ensure we get a current searcher. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-11-01 17:35:56 +01:00
David Heinemeier Hansson
62ffc6e4db Simplified the logging format for parameters (don't include controller, action, and format as duplicates) [DHH] 2008-11-01 15:46:30 +01:00
David Heinemeier Hansson
fbe387ea25 Merge branch 'master' of git@github.com:rails/rails 2008-11-01 15:04:28 +01:00
Luca Guidi
5229fc4cc0 Make sure habtm use class variable to list association valid keys 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1310 state:committed]
 2008-11-01 15:04:08 +01:00
Luca Guidi
3f6653f9fd Make sure habtm use class variable to list association valid keys 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1310 state:committed]
 2008-11-01 12:25:29 +01:00
David Heinemeier Hansson
5110a8e05b Remove the logging of the Session ID when the session store is CookieStore [DHH] 2008-11-01 12:16:15 +01:00
David Heinemeier Hansson
aea7e8c2f3 Accidently nixed a doc header 2008-11-01 12:05:55 +01:00
David Heinemeier Hansson
cbeac93310 Added render :js for people who want to render inline JavaScript replies without using RJS [DHH] 2008-11-01 12:03:49 +01:00
Jeffrey Hardy
408c722757 Really silence spec warnings when running GemDependency tests [#1308 state:resolved] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-10-31 18:45:36 +01:00
David Heinemeier Hansson
c50667e961 Merge branch 'master' of git@github.com:rails/rails 2008-10-31 18:41:45 +01:00
David Heinemeier Hansson
e466ae13e9 Fixed the option merging in Array#to_xml [#1126 state:resolved] 2008-10-31 18:41:25 +01:00
Joshua Peek
fc215de52f Revert "config.load_paths should be frozen [#728 state:resolved]" 
This reverts commit 2dcdcf1552.
 2008-10-30 16:28:23 -05:00