aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
| * migrates the Jamis template to RDoc 2.x, the root Rakefile requires RDoc 2.2Xavier Noria2010-06-163-129/+145
| | | | | | | | To understand the changes in horo.rb check rdoc/template.rb in a RDoc 2.x
* | Add a failing test for ticket #4874José Valim2010-06-171-0/+14
|/
* Merge remote branch 'rails/master'Xavier Noria2010-06-141-18/+21
|\
| * refactors AR::Base#reset_table_nameXavier Noria2010-06-141-19/+20
| |
| * Documentation for #quoted_table_name methodThiago Pradi2010-06-141-0/+2
| | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
* | edit pass: the names of Rails components have a space, ie, "Active Record", ↵Xavier Noria2010-06-1430-48/+48
| | | | | | | | not "ActiveRecord"
* | Fix minor typos and inconsistencies, and one minor grammar changerspeicher2010-06-141-6/+6
| |
* | edit pass in #define_callbacks rdocXavier Noria2010-06-141-20/+22
| |
* | adding to the :kind documentation for ActiveSupport callbacksNeeraj Singh2010-06-141-0/+5
| |
* | clearer documentation of how scope applies to ActiveSupport callbacksNeeraj Singh2010-06-141-20/+32
| |
* | truncate safe method description changesNeeraj Singh2010-06-141-1/+1
| |
* | Added headings to serializers.Rizwan Reza2010-06-143-3/+7
| |
* | Revised the rest of the files from ActiveModel.Rizwan Reza2010-06-143-23/+36
| |
* | Revised and added headings.Rizwan Reza2010-06-143-1/+7
| |
* | Revised naming.rb and lint.rbRizwan Reza2010-06-142-5/+5
| |
* | Added headings and revised active_model.rb/lint.rb grammaticallyRizwan Reza2010-06-141-1/+3
| |