aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | added time (wall, process, cpu) to rubinius' benchmarksGonçalo Silva2011-03-251-3/+11
| | | | | | | |
| * | | | | | | added missing requireGonçalo Silva2011-03-251-0/+2
| | | | | | | |
| * | | | | | | 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 ↵Gonçalo Silva2011-03-252-48/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overridden by each implementation
| * | | | | | | 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 ↵Gonçalo Silva2011-03-242-321/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AS/testing/performance, where it is actually required
| * | | | | | | check if RubyProf's WALL_TIME and PROCESS_TIME are available before using ↵Gonçalo Silva2011-03-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | them (similarly to other constants)
| * | | | | | | Merge branch 'master' of https://github.com/rails/railsGonçalo Silva2011-03-241245-27043/+56363
| |\ \ \ \ \ \ \
| * | | | | | | | added support for more printersGonçalo Silva2010-08-101-5/+9
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of http://github.com/rails/railsGonçalo Silva2010-08-10446-10545/+10118
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of http://github.com/rails/railsGonçalo Silva2010-07-10143-1080/+1978
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of http://github.com/rails/railsGonçalo Silva2010-06-30437-4334/+10662
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | performance tests now working accurately on 1.9, using Ruby with the GCdata ↵Gonçalo Silva2010-06-181-36/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | patch
* | | | | | | | | | | | Bump sprockets dependencyJoshua Peek2011-05-171-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Remove old call to sprockets contextJoshua Peek2011-05-171-9/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Add block setting of attributes to singular associationsAndrew White2011-05-175-11/+64
| | | | | | | | | | | |
* | | | | | | | | | | | Add a test case for issue #476.José Valim2011-05-171-0/+31
| | | | | | | | | | | |
* | | | | | | | | | | | Pass the attribute and option hashes to build_associationAndrew White2011-05-175-8/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build_association method was added as an API for plugins to hook into in 1398db0. This commit restores this API and the ability to override class.new to return a subclass based on a virtual attribute in the attributes hash.
* | | | | | | | | | | | Merge pull request #1093 from lucasmazza/patch-1José Valim2011-05-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Using the correct CSS compressor for the yui-compressor gem.
| * | | | | | | | | | | | Using the correct CSS compressor for the yui-compressor gem.Lucas Mazza2011-05-161-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Use anonymous? that works on both Ruby 1.8 and 1.9.José Valim2011-05-172-5/+7
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1104 from colinyoung/masterJosé Valim2011-05-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Chicago mayor
| * | | | | | | | | | | | | Updated seeds.rb file.Colin Young2011-05-171-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1106 from vatrai/user_instructJosé Valim2011-05-176-2/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instruct user to install using Gem file in database.yml template
| * | | | | | | | | | | | | | instruct user to install using Gem file in database.yml templete issue #1103Vishnu Atrai2011-05-176-2/+22
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #1090 from dchelimsky/issue-1089José Valim2011-05-173-21/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | 3.1: params_wrapper raises error on anynomous controllers
| * | | | | | | | | | | | | | add more robust test for wrapping params with anonymous classDavid Chelimsky2011-05-173-28/+51
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add fix for error when an anonymous controller subclasses ApplicationControllerAndy Lindeman2011-05-171-1/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | better test nameDavid Chelimsky2011-05-171-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | add failing test for https://github.com/rails/rails/issues/1089David Chelimsky2011-05-171-0/+7
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #1105 from kevmoo/b1103José Valim2011-05-172-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | For Issue #1103 - Fix for sqlite3.yml, mysql.yml
| * | | | | | | | | | | | | | Fix for sqlite3.yml, mysql.ymlKevin Moore2011-05-172-3/+4
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1100 from arunagw/innerjoin_testJon Leighton2011-05-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed InnerJoinAssociationTest. Need to load essays fixture.
| * | | | | | | | | | | | | | Fixed InnerJoinAssociationTest. Need to load essays fixture.Arun Agrawal2011-05-171-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Don't print deprecation warnings every time the user reads or writes an ↵Michael Koziarski2011-05-171-2/+0
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inheritable attribute. The warnings on declaration is enough.
* | | | | | | | | | | | | | Merge pull request #1099 from dlee/optimize_indifferent_accessJosé Valim2011-05-172-2/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize parts of HashWithIndifferentAccess
| * | | | | | | | | | | | | | Optimize parts of HashWithIndifferentAccessDavid Lee2011-05-172-2/+15
| |/ / / / / / / / / / / / /
* / / / / / / / / / / / / / Fixes failing test, closes #1098.José Valim2011-05-171-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1095 from guilleiguaran/fix_join_model_testJon Leighton2011-05-171-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding missing require to join_model_test
| * | | | | | | | | | | | | Adding missing requireGuillermo Iguaran2011-05-161-0/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #560 from guilleiguaran/fix_pluralize_table_names_falseJon Leighton2011-05-164-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | Fixing has_many when ActiveRecord::Base.pluralize_table_names is false
| * | | | | | | | | | | | Fixing has_many association when ActiveRecord::Base.pluralize_table_names is ↵Guillermo Iguaran2011-05-154-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | false. fixes #557
* | | | | | | | | | | | | configuratin guide: finished a pass to the "Rails General Configuration" sectionXavier Noria2011-05-161-26/+20
| | | | | | | | | | | | |