aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't overwrite unsaved updates when loading an association but preserve the ↵James Le Cuirot2010-06-203-3/+28
| | | | | | | | 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>
* Strip trailing whitespace from generated applications [#4905 state:resolved]Chris Griego2010-06-205-8/+8
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Support render_template in view tests. Useful for specifying whichDavid Chelimsky2010-06-202-0/+9
| | | | | | | | partials are rendered under different conditions. [#4903 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Don't use module to work out shallow name prefix and path as it may not ↵Andrew White2010-06-202-10/+33
| | | | | | accurately reflect the actual namespace [#4899 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Make polymorphic_url and scaffolding work with uncountable resources [#3930 ↵Andrew White2010-06-2011-11/+58
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Accept an object for :constraints option [#4904 state:resolved]Andrew White2010-06-202-1/+9
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge branch 'master' of github.com:rails/railsJosé Valim2010-06-2014-71/+165
|\
| * option_groups_from_collection_for_select should return HTML-safe string ↵Wincent Colaiuta2010-06-192-19/+13
| | | | | | | | | | | | [#4879 state:resolved] Signed-off-by: Xavier Noria <fxn@hashref.com>
| * Remove a relic of #request being in RackDelegationwycats2010-06-192-6/+9
| |
| * add missing shebang to rails bin. LH [#4885 state:resolved]Scott Taylor2010-06-191-0/+2
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Custom resource routes should be scopedAndrew White2010-06-192-7/+83
| | | | | | | | | | | | [#3765] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fix Yajl backend discovery in ActiveSupport::JSONMaxime RETY2010-06-181-1/+1
| | | | | | | | | | | | [#4897 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fix test which prevents connection reset on failing and remove hardcoded ↵Master Lambaster2010-06-181-8/+7
| | | | | | | | | | | | | | | | connection [#4689 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Adds a few connection parameters for IBM databases.Antonio Cangiano2010-06-181-24/+36
| | | | | | | | | | | | [#3852] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fix bug with rolling back frozen attributes.Brian Durand2010-06-184-6/+14
| | | | | | | | | | | | [#2991] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | ActiveModel::Validations::Callbacks should not be required by default.José Valim2010-06-195-22/+26
| |
* | moving before_validation and after_validation functionality from ↵Neeraj Singh2010-06-196-34/+148
| | | | | | | | | | | | | | | | ActiveRecord to ActiveModel [#4653 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Clear DescendantsTracker on each request.José Valim2010-06-197-40/+81
| |
* | Remove descendants warning while executing tests.José Valim2010-06-192-2/+5
| |
* | ActiveRecord and ActionPack now use the new descendants implementation.José Valim2010-06-195-49/+9
| |
* | Change callbacks to automatically include DescendantsTracker and rename ↵José Valim2010-06-193-10/+17
| | | | | | | | descendents to descendants.
* | Add ActiveSupport::DescendantsTracker.José Valim2010-06-193-0/+109
|/
* form_for without :html and with :remote should not errorDavid Genord II2010-06-182-1/+21
| | | | | | [#4902 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* fix for :shallow in router not generating helpers for create, update, and ↵Josh Kalderimis2010-06-182-5/+42
| | | | | | | | destroy actions when :only or :except are used [#4900 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Credit for the heavy lifting!Jeremy Kemper2010-06-171-1/+1
|
* enable_stats added back in since Benchmarker doesn't start RubyProfGonçalo Silva2010-06-171-1/+9
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* check if the profiler patch is applied, otherwise GC::Profiler doesn't have ↵Gonçalo Silva2010-06-171-1/+1
| | | | the 'data' method
* added information about what is being usedGonçalo Silva2010-06-171-2/+6
|
* heap_live_objects+heap_free_objects is broken, use heap_total_objects insteadGonçalo Silva2010-06-171-2/+1
|
* also use GC profiler extended patch to retrieve GC time on 1.9Gonçalo Silva2010-06-171-1/+12
|
* ruby's GC doesn't support the time method, removed support for itGonçalo Silva2010-06-171-4/+0
|
* use GC profiler extended patch to retrieve GC runs on 1.9Gonçalo Silva2010-06-171-1/+12
|
* ruby's GC doesn't support collections and heap_info, RubyProf can handle itGonçalo Silva2010-06-171-8/+0
|
* GC at 1.9.X doesn't have malloc_allocated_size, remove support for itGonçalo Silva2010-06-171-12/+0
|
* removed support for 1.8's GC alternative hacks (railsbench and lloyd ↵Gonçalo Silva2010-06-171-25/+0
| | | | patches). RubyProf can handle it
* check if the data method is defined (meaning it's correctly patched)Gonçalo Silva2010-06-171-4/+4
|
* the official profiler (present in 1.9) should have the highest priorityGonçalo Silva2010-06-171-31/+31
|
* don't set cpu_frequency if RubyProf resolved itGonçalo Silva2010-06-171-2/+2
|
* setting the timezone in postgres to whatever ruby thinks the timezone is ↵Aaron Patterson2010-06-172-1/+11
| | | | | | [#4895 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* when the timezone is nil, a TimeWithZone object should not be constructed. ↵Aaron Patterson2010-06-173-0/+11
| | | | | | [#4881 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Make text_helpers methods which return valid html to return it as safe and ↵Santiago Pastorino2010-06-172-46/+42
| | | | | | | | sanitize the input always unless :sanitize => false is set [#4825 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* documents how to run an individual test in ARXavier Noria2010-06-171-0/+2
|
* Add shallow routing option to new router [#3765 status:committed]Andrew White2010-06-173-156/+383
| | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* excerpt shoudn't return safe output test addedSantiago Pastorino2010-06-171-0/+4
| | | | | | [#4878] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* truncate() should not try to produce HTML-safe outputWincent Colaiuta2010-06-172-22/+8
| | | | | | | | | | As discussed in Lighthouse ticket #4825 and ticket #4878, the truncate() method cannot guarantee safe output for all possible inputs/offsets, so it is best to leave the output unsafe so that it gets escaped when used in a view. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Merge branch 'master' of github.com:rails/railsJosé Valim2010-06-1711-142/+166
|\
| * pdoc tasks publishe APIs in api.rubyonrails.orgXavier Noria2010-06-165-5/+5
| |
| * use RDoc 2.2 to generate the documentation of individual componentsXavier Noria2010-06-167-4/+15
| |
| * removes the documentation group from the Gemfile, thus making RDoc 2.2 ↵Xavier Noria2010-06-161-4/+1
| | | | | | | | | | | | | | | | required in dev machines In order to generate the API with that particular version we need to activate the gem in the Rakefile before rake. Therefore the Rakefile does not honor --without for that group now. Installing rdoc is no big deal anyway.
| * use assert_in_delta() for floating point comparisons in tests [#4871 ↵Aaron Patterson2010-06-161-1/+1
| | | | | | | | | | | | state:resolved] Signed-off-by: Carl Lerche <carllerche@mac.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-23 03:25:35 +0000