aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4192 from mptre/masterJosé Valim2012-01-052-1/+11
|\
| * Align rake notes.Anton Lindqvist2011-12-262-1/+11
* | Merge pull request #4322 from castlerock/minitest_pendingJosé Valim2012-01-051-33/+1
|\ \
| * | ActiveSupport::Testing::Pending support for MiniTest onlyVishnu Atrai2012-01-051-33/+1
* | | Merge pull request #4324 from juanpastas/patch-1José Valim2012-01-050-0/+0
|\ \ \
| * | | Update activerecord/lib/active_record/base.rbjuan david pastas2012-01-051-1/+0
| |/ /
* | | Merge pull request #4333 from rafaelfranca/patch-1José Valim2012-01-0513-35/+28
|\ \ \
| * | | Whitespaces :scissors:Rafael Mendonça França2012-01-052-7/+6
| * | | Refactor extract_selected_and_disabledRafael Mendonça França2012-01-051-1/+2
| * | | Change more Array.wrap to Kernel#ArrayRafael Mendonça França2012-01-059-19/+14
| * | | Use Kernel#Array in ActionController::HelpersRafael Mendonça França2012-01-051-2/+1
| * | | Use Kernel#Array instead of Array.wrap in view_pathsRafael Mendonça França2012-01-053-4/+3
| * | | Array.wrap is no longer needed in AbstractController::CallbacksRafael Mendonça França2012-01-051-2/+2
* | | | Merge pull request #4332 from norman/multibyteJosé Valim2012-01-058-355/+73
|\ \ \ \
| * | | | Use friendlier method nameNorman Clarke2012-01-052-3/+3
| * | | | Use friendlier method names for upcasing/downcasingNorman Clarke2012-01-052-12/+20
| * | | | Use more descriptive method namesNorman Clarke2012-01-052-8/+8
| * | | | Move include to top of class for clarityNorman Clarke2012-01-051-2/+1
| * | | | Remove unnecessary requires/encoding commentNorman Clarke2012-01-051-3/+0
| * | | | Replace Unicode.u_unpack with String#codepointsNorman Clarke2012-01-055-38/+5
| * | | | Remove multibyte utilsNorman Clarke2012-01-053-140/+1
| * | | | Remove "_codepoints" from compose/decomposeNorman Clarke2012-01-052-9/+9
| * | | | Remove unused code.Norman Clarke2012-01-051-25/+0
| * | | | Document method definitionNorman Clarke2012-01-051-0/+2
| * | | | Just use Ruby's String#[]=Norman Clarke2012-01-052-46/+0
| * | | | Assume Encoding supportNorman Clarke2012-01-051-5/+1
| * | | | Update to Unicode 6.0Norman Clarke2012-01-052-1/+1
| * | | | Remove useless parensNorman Clarke2012-01-051-1/+1
| * | | | Just delegate a few methods directly to @wrapped_stringNorman Clarke2012-01-051-20/+3
| * | | | Merge branch 'refactor-multibyte-chars' of https://github.com/lest/rails into...Norman Clarke2012-01-053-12/+6
| |\ \ \ \
| | * | | | refactor AS::Multibyte::CharsSergey Nartimov2012-01-052-40/+6
| | | |/ / | | |/| |
| * | | | Make return value from bang methods match Ruby docsNorman Clarke2012-01-052-6/+12
| * | | | Override #slice! to ensure proper return value.Norman Clarke2012-01-051-0/+4
| * | | | Remove overidden slice and slice! methods.Norman Clarke2012-01-051-29/+1
| * | | | Fix incorrect behavior specified in test.Norman Clarke2012-01-051-1/+1
* | | | | Merge pull request #4335 from lest/useless-multibyte-cleanJosé Valim2012-01-051-1/+1
|\ \ \ \ \
| * | | | | remove use of Multibyte.clean as it's no-op in ruby 1.9Sergey Nartimov2012-01-061-1/+1
* | | | | | Merge pull request #4334 from lest/remove-obsolete-commented-assertsJosé Valim2012-01-051-6/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | remove obsolete commented asserts in TextHelper testsSergey Nartimov2012-01-061-6/+0
|/ / / / /
* | | | | Merge pull request #4330 from lest/remove-call-mbcharsAaron Patterson2012-01-052-5/+5
|\ \ \ \ \
| * | | | | remove useless call to mb_charsSergey Nartimov2012-01-052-5/+5
* | | | | | Merge pull request #4303 from Karunakar/loggerSantiago Pastorino2012-01-0513-17/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Moved all the logger methods to active support loggerKarunakar (Ruby)2012-01-0613-17/+15
* | | | | | Merge pull request #4329 from rafaelfranca/patch-1Jeremy Kemper2012-01-052-11/+8
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Array.wrap is no longer needed hereRafael Mendonça França2012-01-052-11/+8
|/ / / / /
* / / / / do not require a file that is not usedAaron Patterson2012-01-052-2/+1
|/ / / /
* | | | delete reaping frequency from the db configAaron Patterson2012-01-051-4/+6
* | | | Merge pull request #4301 from Karunakar/refactor_testsAaron Patterson2012-01-051-4/+7
|\ \ \ \
| * | | | removed unnecessary +1 from assert_difference because default difference is 1Karunakar (Ruby)2012-01-051-1/+1
| * | | | refactored tests -- assert_diffrence instead of checking directly with countKarunakar (Ruby)2012-01-041-4/+7