aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | 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
| |\ \ \ \ \ \
| * | | | | | | 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 p...Gonçalo Silva2010-06-181-36/+18
* | | | | | | | | | | 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
* | | | | | | | | | | Merge pull request #1093 from lucasmazza/patch-1José Valim2011-05-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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 templete issue #1103Vishnu Atrai2011-05-176-2/+22
* | | | | | | | | | | | | | Merge pull request #1090 from dchelimsky/issue-1089José Valim2011-05-173-21/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | 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.Arun Agrawal2011-05-171-1/+1
* | | | | | | | | | | | | | Don't print deprecation warnings every time the user reads or writes an inher...Michael Koziarski2011-05-171-2/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1099 from dlee/optimize_indifferent_accessJosé Valim2011-05-172-2/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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 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 association when ActiveRecord::Base.pluralize_table_names is ...Guillermo Iguaran2011-05-154-1/+19
* | | | | | | | | | | | configuratin guide: finished a pass to the "Rails General Configuration" sectionXavier Noria2011-05-161-26/+20
* | | | | | | | | | | | Deprecate attr_accessor_with_default.José Valim2011-05-162-4/+13
* | | | | | | | | | | | Merge pull request #1087 from amatsuda/generate_number_field_tagJosé Valim2011-05-162-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | generate HTML5 number_field tag for integer fieldsAkira Matsuda2011-05-162-7/+12
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1085 from amatsuda/amo_validator_initializer_cleanupJosé Valim2011-05-162-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove unneeded merge with default false optionsAkira Matsuda2011-05-161-4/+0
| * | | | | | | | | | | | Don't add DEFAULT_TOKENIZER to every instance of LengthValidator. Just use it...Akira Matsuda2011-05-161-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #573 from smartinez87/attrJosé Valim2011-05-151-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add doc to #attribute_namesSebastian Martinez2011-05-151-0/+3
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #570 from sikachu/decouple_actionpackJosé Valim2011-05-156-14/+35
|\ \ \ \ \ \ \ \ \ \ \ \