aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
* | Minor changes to active_model/errors.rbRizwan Reza2010-06-141-8/+16
* | Minor changes to active_model/callbacks.rb and dirty.rbRizwan Reza2010-06-142-7/+12
* | Minor changes to active_model/attribute_methodsRizwan Reza2010-06-141-24/+30
* | Minor changes to callbacks and conversion API docs.Rizwan Reza2010-06-142-13/+17
|/
* Merge branch 'master' of git://github.com/rails/railsRizwan Reza2010-06-1428-152/+185
|\
| * docfix (email instead of emai)David Chelimsky2010-06-131-3/+3
| * explains why AS::OrderedHash does not leverage inheritanceXavier Noria2010-06-131-0/+11
| * render(:inline) in a layout before yield replaces original contentNeeraj Singh2010-06-133-1/+9
| * removes spurious .rb in requireSantiago Pastorino2010-06-131-1/+1
| * Tidy up generators based on latest change on AM.José Valim2010-06-133-4/+4
| * CI changes per Chad's requestwycats2010-06-131-2/+2
| * Change implementation to do it without asking each time for block_given?Santiago Pastorino2010-06-131-6/+4
| * revises implementation of AS::OrderedHash#merge!Xavier Noria2010-06-133-21/+24
| * Revert "hash merging with a block ignores non-existing keys altogether"Xavier Noria2010-06-132-17/+18
| * hash merging with a block ignores non-existing keys altogetherXavier Noria2010-06-132-18/+17