aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Substitute "gem" for "plugin" in contributing guideJo Liss2012-01-081-2/+2
* Made an example a little more realisticcodesnik2012-01-071-1/+1
* Expanded rdoc about primary keys being protected from mass assignment. Joost Baaij2012-01-061-1/+2
* remove ruby 1.8 example from Array.wrap documentationSergey Nartimov2012-01-051-3/+0
* Update ConfirmationValidator docs, correct when the validator runsAlan Harper2012-01-051-1/+1
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-01-042-75/+112
|\
| * copy editsVijay Dev2012-01-041-10/+7
| * Merge branch 'master' of github.com:lifo/docrailsPablo Ifran2012-01-0230-240/+570
| |\
| | * General editing pass over assets pipeline guideMike Gunderloy2011-12-311-56/+58
| * | improve doc in number helper optionsPablo Ifran2012-01-021-19/+57
* | | updates to 3.2 release notesVijay Dev2012-01-041-1/+8
* | | create_fixtures should accept symbol keys for custom table -> class mappings....Jeremy Kemper2012-01-032-4/+14
* | | Merge pull request #4286 from kennyj/fix_4285José Valim2012-01-032-1/+7
|\ \ \
| * | | Fix GH #4285. Remove options when we record calling creat_tablekennyj2012-01-042-1/+7
|/ / /
* | | use File.basename to get the filename minus .ymlAaron Patterson2012-01-031-2/+3
* | | setup_fixture_accessors should accept symbols for table names. Fixes an unint...Jeremy Kemper2012-01-032-1/+2
* | | Merge pull request #2955 from dmitry/masterAaron Patterson2012-01-035-9/+19
|\ \ \
| * | | Removed metaclass from the has_many dependency destroy method. Fixes #2954Dmitry Polushkin2011-12-312-8/+5
| * | | Merge branch 'master' of git://github.com/rails/railsDmitry Polushkin2011-12-31795-28340/+35803
| |\ \ \
| * \ \ \ Merge branch 'master' of git://github.com/rails/railsDmitry Polushkin2011-10-0562-374/+686
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git://github.com/rails/railsDmitry Polushkin2011-10-01123-668/+1492
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsDmitry Polushkin2011-09-15190-825/+2362
| |\ \ \ \ \ \
| * | | | | | | Test polymorphic record with optimistic locking and counter cache should be d...Dmitry Polushkin2011-09-093-1/+14
* | | | | | | | Merge pull request #4283 from lest/fix-singleton-checkingAaron Patterson2012-01-031-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | use correct variant of checking whether class is a singletonSergey Nartimov2012-01-031-1/+1
|/ / / / / / / /
* | | | | | | | Pass extensions to javascript_path and stylesheet_path helpers. Closes #3417Santiago Pastorino2012-01-032-2/+8
* | | | | | | | Override respond_to? since we are also overriding method_missing.José Valim2012-01-032-0/+11
* | | | | | | | Clean up routes inclusion and add some comments for the next soul that decide...José Valim2012-01-034-60/+49
* | | | | | | | Add font_path helper methodSantiago Pastorino2012-01-036-0/+41
* | | | | | | | actually disconnect from the database at the end of each testAaron Patterson2012-01-031-2/+2
* | | | | | | | Merge pull request #4274 from joneslee85/changelog-fixAaron Patterson2012-01-031-114/+122
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix typos and formats for CHANGELOGTrung Lê2012-01-041-114/+122
* | | | | | | | | Merge pull request #4279 from lest/fix-logAaron Patterson2012-01-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | do not rewrite log during application bootstrapSergey Nartimov2012-01-031-1/+1
* | | | | | | | | | Merge pull request #4278 from kennyj/fix_rdoc_generating_problemSantiago Pastorino2012-01-031-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Use -e option instead of -c option (rake rdoc task).kennyj2012-01-041-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4265 from laserlemon/patch-1Vijay Dev2012-01-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix grammatical error in ActiveModel::MassAssignmentSecurity::PermissionSet#d...Steve Richert2012-01-021-1/+1
* | | | | | | | | | Rails::Plugin has goneSantiago Pastorino2012-01-0337-1186/+30
* | | | | | | | | | Merge pull request #4272 from apotonick/ac-process-rebaseJosé Valim2012-01-032-25/+74
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | moving test_test.rb to test_case_test.rb for consistency.Nick Sutterer2012-01-031-0/+0
| * | | | | | | | | | allow sending documents in AC::TestCase#post and friends.Nick Sutterer2012-01-032-25/+74
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #4250 from lest/range-jsonXavier Noria2012-01-022-0/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | use #to_s to convert Range to jsonSergey Nartimov2012-01-012-0/+8
* | | | | | | | | | | Merge pull request #4266 from lest/deprecate-activesupport-base64José Valim2012-01-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix base64 requireSergey Nartimov2012-01-031-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #4252 from lest/deprecate-activesupport-base64José Valim2012-01-0212-63/+35
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | remove ActiveSupport::Base64 in favor of ::Base64Sergey Nartimov2012-01-0212-63/+35
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #4253 from lest/remove-warningsJosé Valim2012-01-021-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix use of FormBuilder.field_helpersSergey Nartimov2012-01-021-1/+1