aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/railsJosé Valim2010-06-2014-71/+165
|\
| * option_groups_from_collection_for_select should return HTML-safe string [#487...Wincent Colaiuta2010-06-192-19/+13
| * 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
| * Custom resource routes should be scopedAndrew White2010-06-192-7/+83
| * Fix Yajl backend discovery in ActiveSupport::JSONMaxime RETY2010-06-181-1/+1
| * Fix test which prevents connection reset on failing and remove hardcoded conn...Master Lambaster2010-06-181-8/+7
| * Adds a few connection parameters for IBM databases.Antonio Cangiano2010-06-181-24/+36
| * Fix bug with rolling back frozen attributes.Brian Durand2010-06-184-6/+14
* | ActiveModel::Validations::Callbacks should not be required by default.José Valim2010-06-195-22/+26
* | moving before_validation and after_validation functionality from ActiveRecord...Neeraj Singh2010-06-196-34/+148
* | 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 desce...José Valim2010-06-193-10/+17
* | 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
* fix for :shallow in router not generating helpers for create, update, and des...Josh Kalderimis2010-06-182-5/+42
* 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
* check if the profiler patch is applied, otherwise GC::Profiler doesn't have t...Gonçalo Silva2010-06-171-1/+1
* 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 patches)...Gonçalo Silva2010-06-171-25/+0
* 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 [#48...Aaron Patterson2010-06-172-1/+11
* when the timezone is nil, a TimeWithZone object should not be constructed. [#...Aaron Patterson2010-06-173-0/+11
* Make text_helpers methods which return valid html to return it as safe and sa...Santiago Pastorino2010-06-172-46/+42
* 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
* excerpt shoudn't return safe output test addedSantiago Pastorino2010-06-171-0/+4
* truncate() should not try to produce HTML-safe outputWincent Colaiuta2010-06-172-22/+8
* 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 requir...Xavier Noria2010-06-161-4/+1
| * use assert_in_delta() for floating point comparisons in tests [#4871 state:re...Aaron Patterson2010-06-161-1/+1
| * migrates the Jamis template to RDoc 2.x, the root Rakefile requires RDoc 2.2Xavier Noria2010-06-163-129/+145
* | 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
* | edit pass: the names of Rails components have a space, ie, "Active Record", n...Xavier Noria2010-06-1430-48/+48