aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* removed leftovers from the copy-paste from mriGonçalo Silva2011-03-251-9/+0
* rubinius returns "rbx" for RUBY_ENGINE, not "rubinius"Gonçalo Silva2011-03-251-2/+2
* added basic structure for RubiniusGonçalo Silva2011-03-253-6/+68
* divide the ruby interpreter into mri and yarv for improved modularityGonçalo Silva2011-03-253-70/+145
* renamed "mri" to "ruby", for consistency with RUBY_ENGINEGonçalo Silva2011-03-254-2/+2
* check whether the user is using a supported ruby interpreter for benchmarkingGonçalo Silva2011-03-251-1/+7
* using number_helper to pretty print some results Gonçalo Silva2011-03-252-19/+16
* extracted more generic methods, added a note for methods that need to be over...Gonçalo Silva2011-03-252-48/+87
* initial separation of RubyProf-specific codeGonçalo Silva2011-03-252-218/+241
* ruby-prof only makes sense in an MRI contextGonçalo Silva2011-03-251-5/+7
* move "check for ruby-prof" from AD/testing/performance_test to AS/testing/per...Gonçalo Silva2011-03-242-321/+319
* check if RubyProf's WALL_TIME and PROCESS_TIME are available before using the...Gonçalo Silva2011-03-241-2/+2
* Merge branch 'master' of https://github.com/rails/railsGonçalo Silva2011-03-241245-27043/+56363
|\
| * add #first! and #last! to models & relationsJosh Susser2011-03-242-0/+34
| * Fix filter :only and :except with implicit actionsAndrew White2011-03-232-12/+17
| * Add a failing test case for an implicit action with a before filter.Manfred Stienstra2011-03-233-0/+24
| * Fix before_type_cast for timezone aware attributes by caching converted value...Adam Meehan2011-03-232-19/+16
| * Make clearing of HABTM join table contents happen in an after_destory callback.Murray Steele2011-03-231-12/+12
| * Failing test case to show that habtm join table contents are removed when a m...Murray Steele2011-03-231-0/+34
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-238-7/+36
| |\
| | * Update 'Getting Started on Windows' tip to go to one-click Rails InstallerDr Nic Williams2011-03-221-1/+1
| | * Caching guide: Capitalize 'Note' so that it's rendered as a proper noteRyan Bigg2011-03-231-1/+1
| | * Querying guide: mention that performing a where on an relation that contains ...Ryan Bigg2011-03-221-1/+3
| | * Querying guide: mention that performing a where on an relation that contains ...Ryan Bigg2011-03-221-0/+14
| | * Beef up Rails::Railtie::Configuration docsGabriel Horner2011-03-191-0/+8
| | * remove bank linePaco Guzman2011-03-181-1/+0
| | * Add link to mailing-listNicolas Cavigneaux2011-03-161-1/+1
| | * Remove incorrect comment that a default value of NULL cannot be set with chan...Manuel Meurer2011-03-161-3/+2
| | * doc :anchor option for #match in routesGabriel Horner2011-03-151-0/+7
| * | Fix test for prepend giving a false positive. [#5716 state:resolved]Aditya Sanghi2011-03-232-3/+2
| * | parse dates to yaml in json arraysDiego Carrion2011-03-222-2/+4
| * | test json decoding with time parsing disabled with all backends and respect A...Diego Carrion2011-03-222-7/+7
| * | use class_eval with a string when it's possibleSantiago Pastorino2011-03-223-7/+21
| * | Allow to read and write AR attributes with non valid identifiersSantiago Pastorino2011-03-224-2/+22
| * | Do not in place modify what table_name returnsSantiago Pastorino2011-03-223-13/+2
| * | Install rb-fsevent gem if ENV[RB_FSEVENT] is setPiotr Sarnacki2011-03-221-0/+3
| * | adding missing requireAaron Patterson2011-03-221-0/+1
| * | Merge branch 'master' into fuuuAaron Patterson2011-03-2220-45/+256
| |\ \
| | * | Do not show optional (.:format) block for wildcard route [#6605 state:resolved]Prem Sichanugrist2011-03-222-1/+8
| | * | pushing id insertion and prefetch primary keys down to Relation#insertAaron Patterson2011-03-224-12/+23
| | * | use prepared statements to fetch the last insert idAaron Patterson2011-03-211-3/+4
| | * | escaping binary data encoding when inserting to sqlite3. Thanks Naruse! [#655...Aaron Patterson2011-03-212-0/+27
| | * | schemas set by set_table_name are respected by the mysql adapter. [#5322 stat...Aaron Patterson2011-03-212-2/+52
| | * | Reapply extensions when using except and onlyIain Hecker2011-03-212-0/+14
| | * | SJIS is an alias to Windows-31J in ruby trunk. Use SHIFT_JIS for this testAaron Patterson2011-03-211-2/+2
| | * | Improved resolver docs a bitJosé Valim2011-03-191-2/+10
| | * | [action_view] docs for FileSystemResolverChris Kowalik2011-03-201-2/+30
| | * | [action_view] added custom patterns to template resolverChris Kowalik2011-03-206-24/+89
| * | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-182-8/+69
| |\| |
| | * | define_attr_method should be able to define methods that returns nilSantiago Pastorino2011-03-172-2/+4