Commit Graph

16865 Commits

Author SHA1 Message Date
Steve Abatangle
4515947845 Fix problem with migrations template that can cause bogus code to be created
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 12:32:51 +02:00
Carlos Antonio da Silva
f9abbf9a4d Adding missing test to autolink with other protocols (file) [#4886 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 12:32:41 +02:00
Jan De Poorter
96f5e59a26 Make sure a namespaced <%= render form %> still renders the _form partial [#4784 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:58:10 +02:00
Ryan Duryea
73df48083a Added absolute path for config.ru as well. Turns out this is also needed to fix the daemon issue under ruby 1.8.7
[#4531 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:57:29 +02:00
Ryan Duryea
bb324693ab Pass rack the absolute path of server's pid file
When running as a daemon, rack will cd to "/" and paths relative to the
root of the rails app aren't valid when rack is setting up.  Because of
this, "rails server -d" was failing silently when trying to write it's
pid file

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:57:15 +02:00
Tarsoly András
bb6cd6d3ec Use Rack::Utils.bytesize when calculating content-length of exception pages. [#4727 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:52:35 +02:00
Norman Clarke
667522ca98 Adds titleize/titlecase to AS::Multibyte::Chars
[#2794 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:51:19 +02:00
rohit
95a8f252c0 remove executable permission from files that don't need it. [#4802 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:50:48 +02:00
Emilio Tagua
e061212e86 Refactor build_arel: move joins out and simplify havings. [#4860 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:37:55 +02:00
Sam Elliott and Santiago Pastorino
02ea1aa88c <=> is defined twice on multibyte/chars.rb for Ruby < 1.9
[#4850 state:committed]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:35:20 +02:00
James Le Cuirot
f664c57fe8 Don't overwrite unsaved updates when loading an association but preserve the order of the loaded records. Reapplied from before but now allows already-saved records to be refreshed.
[#4830 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:32:06 +02:00
Chris Griego
98a5188f51 Strip trailing whitespace from generated applications [#4905 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:28:41 +02:00
David Chelimsky
86002a0dfe Support render_template in view tests. Useful for specifying which
partials are rendered under different conditions.

[#4903 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:26:42 +02:00
Andrew White
1f84061c5c Don't use module to work out shallow name prefix and path as it may not accurately reflect the actual namespace [#4899 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:15:48 +02:00
Andrew White
ed3f042e99 Make polymorphic_url and scaffolding work with uncountable resources [#3930 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:15:41 +02:00
Andrew White
65ce3d1297 Accept an object for :constraints option [#4904 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:15:30 +02:00
José Valim
72725d7b7f Merge branch 'master' of github.com:rails/rails 2010-06-20 00:12:54 +02:00
José Valim
0247995d05 ActiveModel::Validations::Callbacks should not be required by default. 2010-06-19 18:20:02 +02:00
Neeraj Singh
51739d3228 moving before_validation and after_validation functionality from ActiveRecord to ActiveModel
[#4653 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-19 17:59:52 +02:00
José Valim
312f433241 Clear DescendantsTracker on each request. 2010-06-19 17:51:44 +02:00
Wincent Colaiuta
728b9eccad option_groups_from_collection_for_select should return HTML-safe string [#4879 state:resolved]
Signed-off-by: Xavier Noria <fxn@hashref.com>
2010-06-19 17:22:49 +02:00
wycats
f368b21cb6 Remove a relic of #request being in RackDelegation 2010-06-19 08:19:15 -07:00
José Valim
d430db9fd4 Remove descendants warning while executing tests. 2010-06-19 17:16:11 +02:00
José Valim
033e0a041f ActiveRecord and ActionPack now use the new descendants implementation. 2010-06-19 17:15:21 +02:00
José Valim
a2b7fcb07c Change callbacks to automatically include DescendantsTracker and rename descendents to descendants. 2010-06-19 16:58:15 +02:00
José Valim
8db8c6f4ce Add ActiveSupport::DescendantsTracker. 2010-06-19 16:44:35 +02:00
Scott Taylor
4bfff05f37 add missing shebang to rails bin. LH [#4885 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-19 00:54:42 -07:00
Andrew White
bf59717b43 Custom resource routes should be scoped
[#3765]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-19 00:15:06 -07:00
Maxime RETY
2c2a5fe829 Fix Yajl backend discovery in ActiveSupport::JSON
[#4897 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-18 20:12:31 -07:00
Master Lambaster
a7cae64104 Fix test which prevents connection reset on failing and remove hardcoded connection
[#4689 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-18 15:28:14 -07:00
Antonio Cangiano
bfc05e244c Adds a few connection parameters for IBM databases.
[#3852]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-18 15:27:11 -07:00
Brian Durand
237165feb3 Fix bug with rolling back frozen attributes.
[#2991]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-18 15:11:17 -07:00
David Genord II
a186431414 form_for without :html and with :remote should not error
[#4902 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-18 13:59:28 -07:00
Josh Kalderimis
9d3eeb9053 fix for :shallow in router not generating helpers for create, update, and destroy actions when :only or :except are used
[#4900 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-18 13:59:14 -07:00
Jeremy Kemper
a55d83292f Credit for the heavy lifting! 2010-06-17 22:18:12 -07:00
Gonçalo Silva
113b0ec03c enable_stats added back in since Benchmarker doesn't start RubyProf
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-17 22:15:16 -07:00
Gonçalo Silva
0cef199c8e check if the profiler patch is applied, otherwise GC::Profiler doesn't have the 'data' method 2010-06-17 19:18:53 -07:00
Gonçalo Silva
c8019cd04a added information about what is being used 2010-06-17 19:18:53 -07:00
Gonçalo Silva
b169d83787 heap_live_objects+heap_free_objects is broken, use heap_total_objects instead 2010-06-17 19:18:53 -07:00
Gonçalo Silva
5e5d1babb0 also use GC profiler extended patch to retrieve GC time on 1.9 2010-06-17 19:18:53 -07:00
Gonçalo Silva
f02d3f9eee ruby's GC doesn't support the time method, removed support for it 2010-06-17 19:18:52 -07:00
Gonçalo Silva
175164397b use GC profiler extended patch to retrieve GC runs on 1.9 2010-06-17 19:18:52 -07:00
Gonçalo Silva
555c3b5abe ruby's GC doesn't support collections and heap_info, RubyProf can handle it 2010-06-17 19:18:52 -07:00
Gonçalo Silva
4813462eea GC at 1.9.X doesn't have malloc_allocated_size, remove support for it 2010-06-17 19:18:52 -07:00
Gonçalo Silva
36f5d09692 removed support for 1.8's GC alternative hacks (railsbench and lloyd patches). RubyProf can handle it 2010-06-17 19:18:52 -07:00
Gonçalo Silva
cb74cfc9c1 check if the data method is defined (meaning it's correctly patched) 2010-06-17 19:18:52 -07:00
Gonçalo Silva
901452d06a the official profiler (present in 1.9) should have the highest priority 2010-06-17 19:18:52 -07:00
Gonçalo Silva
381a30fbba don't set cpu_frequency if RubyProf resolved it 2010-06-17 19:18:52 -07:00
Aaron Patterson
bf6661c5d7 setting the timezone in postgres to whatever ruby thinks the timezone is [#4895 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-17 16:49:21 -07:00
Aaron Patterson
5ae7a9d31d when the timezone is nil, a TimeWithZone object should not be constructed. [#4881 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-17 14:14:30 -07:00