Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | divide the ruby interpreter into mri and yarv for improved modularity | Gonçalo Silva | 2011-03-25 | 3 | -70/+145 | |
| | | | | | | | ||||||
| * | | | | | | renamed "mri" to "ruby", for consistency with RUBY_ENGINE | Gonçalo Silva | 2011-03-25 | 4 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | check whether the user is using a supported ruby interpreter for benchmarking | Gonçalo Silva | 2011-03-25 | 1 | -1/+7 | |
| | | | | | | | ||||||
| * | | | | | | using number_helper to pretty print some results | Gonçalo Silva | 2011-03-25 | 2 | -19/+16 | |
| | | | | | | | ||||||
| * | | | | | | extracted more generic methods, added a note for methods that need to be ↵ | Gonçalo Silva | 2011-03-25 | 2 | -48/+87 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | overridden by each implementation | |||||
| * | | | | | | initial separation of RubyProf-specific code | Gonçalo Silva | 2011-03-25 | 2 | -218/+241 | |
| | | | | | | | ||||||
| * | | | | | | ruby-prof only makes sense in an MRI context | Gonçalo Silva | 2011-03-25 | 1 | -5/+7 | |
| | | | | | | | ||||||
| * | | | | | | move "check for ruby-prof" from AD/testing/performance_test to ↵ | Gonçalo Silva | 2011-03-24 | 2 | -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 Silva | 2011-03-24 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | them (similarly to other constants) | |||||
| * | | | | | | Merge branch 'master' of https://github.com/rails/rails | Gonçalo Silva | 2011-03-24 | 1245 | -27043/+56363 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | added support for more printers | Gonçalo Silva | 2010-08-10 | 1 | -5/+9 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' of http://github.com/rails/rails | Gonçalo Silva | 2010-08-10 | 446 | -10545/+10118 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of http://github.com/rails/rails | Gonçalo Silva | 2010-07-10 | 143 | -1080/+1978 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of http://github.com/rails/rails | Gonçalo Silva | 2010-06-30 | 437 | -4334/+10662 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | performance tests now working accurately on 1.9, using Ruby with the GCdata ↵ | Gonçalo Silva | 2010-06-18 | 1 | -36/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | patch | |||||
* | | | | | | | | | | | Bump sprockets dependency | Joshua Peek | 2011-05-17 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Remove old call to sprockets context | Joshua Peek | 2011-05-17 | 1 | -9/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Add block setting of attributes to singular associations | Andrew White | 2011-05-17 | 5 | -11/+64 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Add a test case for issue #476. | José Valim | 2011-05-17 | 1 | -0/+31 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Pass the attribute and option hashes to build_association | Andrew White | 2011-05-17 | 5 | -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-1 | José Valim | 2011-05-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Using the correct CSS compressor for the yui-compressor gem. | |||||
| * | | | | | | | | | | | Using the correct CSS compressor for the yui-compressor gem. | Lucas Mazza | 2011-05-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Use anonymous? that works on both Ruby 1.8 and 1.9. | José Valim | 2011-05-17 | 2 | -5/+7 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #1104 from colinyoung/master | José Valim | 2011-05-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Chicago mayor | |||||
| * | | | | | | | | | | | | Updated seeds.rb file. | Colin Young | 2011-05-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #1106 from vatrai/user_instruct | José Valim | 2011-05-17 | 6 | -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 #1103 | Vishnu Atrai | 2011-05-17 | 6 | -2/+22 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #1090 from dchelimsky/issue-1089 | José Valim | 2011-05-17 | 3 | -21/+54 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | 3.1: params_wrapper raises error on anynomous controllers | |||||
| * | | | | | | | | | | | | | add more robust test for wrapping params with anonymous class | David Chelimsky | 2011-05-17 | 3 | -28/+51 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Add fix for error when an anonymous controller subclasses ApplicationController | Andy Lindeman | 2011-05-17 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | better test name | David Chelimsky | 2011-05-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | add failing test for https://github.com/rails/rails/issues/1089 | David Chelimsky | 2011-05-17 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #1105 from kevmoo/b1103 | José Valim | 2011-05-17 | 2 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | For Issue #1103 - Fix for sqlite3.yml, mysql.yml | |||||
| * | | | | | | | | | | | | | Fix for sqlite3.yml, mysql.yml | Kevin Moore | 2011-05-17 | 2 | -3/+4 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #1100 from arunagw/innerjoin_test | Jon Leighton | 2011-05-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed InnerJoinAssociationTest. Need to load essays fixture. | |||||
| * | | | | | | | | | | | | | Fixed InnerJoinAssociationTest. Need to load essays fixture. | Arun Agrawal | 2011-05-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Don't print deprecation warnings every time the user reads or writes an ↵ | Michael Koziarski | 2011-05-17 | 1 | -2/+0 | |
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inheritable attribute. The warnings on declaration is enough. | |||||
* | | | | | | | | | | | | | Merge pull request #1099 from dlee/optimize_indifferent_access | José Valim | 2011-05-17 | 2 | -2/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize parts of HashWithIndifferentAccess | |||||
| * | | | | | | | | | | | | | Optimize parts of HashWithIndifferentAccess | David Lee | 2011-05-17 | 2 | -2/+15 | |
| |/ / / / / / / / / / / / | ||||||
* / / / / / / / / / / / / | Fixes failing test, closes #1098. | José Valim | 2011-05-17 | 1 | -1/+1 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #1095 from guilleiguaran/fix_join_model_test | Jon Leighton | 2011-05-17 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding missing require to join_model_test | |||||
| * | | | | | | | | | | | | Adding missing require | Guillermo Iguaran | 2011-05-16 | 1 | -0/+1 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #560 from guilleiguaran/fix_pluralize_table_names_false | Jon Leighton | 2011-05-16 | 4 | -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 Iguaran | 2011-05-15 | 4 | -1/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | false. fixes #557 | |||||
* | | | | | | | | | | | | configuratin guide: finished a pass to the "Rails General Configuration" section | Xavier Noria | 2011-05-16 | 1 | -26/+20 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Deprecate attr_accessor_with_default. | José Valim | 2011-05-16 | 2 | -4/+13 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #1087 from amatsuda/generate_number_field_tag | José Valim | 2011-05-16 | 2 | -7/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | generate HTML5 number_field tag for integer fields | |||||
| * | | | | | | | | | | | | generate HTML5 number_field tag for integer fields | Akira Matsuda | 2011-05-16 | 2 | -7/+12 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #1085 from amatsuda/amo_validator_initializer_cleanup | José Valim | 2011-05-16 | 2 | -6/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanups on AMo validator initializers | |||||
| * | | | | | | | | | | | | Remove unneeded merge with default false options | Akira Matsuda | 2011-05-16 | 1 | -4/+0 | |
| | | | | | | | | | | | | |