aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix safe string interpolation with SafeBuffer#%, closes #6352Vasiliy Ermolovich2012-05-162-0/+38
* remove image_tag onmouseover option docs [ci skip]Vijay Dev2012-05-161-6/+0
* Remove unneeded testsPiotr Sarnacki2012-05-161-12/+0
* Merge pull request #6347 from avakhov/ar-changelog-misprintVijay Dev2012-05-151-1/+1
|\
| * Fix misprint in AR changelogAlexey Vakhov2012-05-161-1/+1
* | Fix tests in railtiesPiotr Sarnacki2012-05-151-1/+1
* | improve #6318Michal Papis2012-05-152-5/+11
* | Merge pull request #6344 from erichmenge/patch_sqlite_time_typePiotr Sarnacki2012-05-154-4/+16
|\ \ | |/ |/|
| * SQLite3 doesn't actually support the 'time' type.Erich Menge2012-05-154-4/+16
* | Merge pull request #6346 from oscardelben/patch-9Piotr Sarnacki2012-05-151-4/+0
|\ \
| * | Remove useless check of adapterOscar Del Ben2012-05-151-4/+0
|/ /
* | Merge pull request #6343 from oscardelben/bump_sqlite3Rafael Mendonça França2012-05-151-1/+1
|\ \ | |/ |/|
| * Bumo sqlite3 gemOscar Del Ben2012-05-151-1/+1
* | Merge pull request #6273 from KensoDev/feature/simple_format_refactoringRafael Mendonça França2012-05-152-9/+27
|\ \
| * | Added the wrapper tag option to simple_formatAvi Tzurel2012-05-142-2/+12
| * | simple_format refactoringAvi Tzurel2012-05-141-9/+17
* | | Merge pull request #6333 from carlosgaldino/unnecessary-callRafael Mendonça França2012-05-151-1/+1
|\ \ \
| * | | Remove unnecessary calls to primary_key on sqlite3_adapterCarlos Galdino2012-05-151-1/+1
|/ / /
* | | Merge pull request #6325 from kennyj/fix_5832-3Carlos Antonio da Silva2012-05-151-5/+1
|\ \ \
| * | | Remove unnecessary assertions. We should only test the before_seq isn't same ...kennyj2012-05-161-5/+1
* | | | Merge pull request #6327 from nashby/string-interpolationCarlos Antonio da Silva2012-05-153-17/+0
|\ \ \ \
| * | | | remove backported string interpolationVasiliy Ermolovich2012-05-153-17/+0
|/ / / /
* | | | Expand and improve #pluck docsJeremy Kemper2012-05-151-6/+27
* | | | Restore support for Model.pluck('sql fragment')Jeremy Kemper2012-05-152-1/+10
* | | | Kill whitespaces :scissors:Carlos Antonio da Silva2012-05-152-3/+3
* | | | Merge pull request #6322 from acapilleri/some_mispelling_errorsRafael Mendonça França2012-05-151-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | corrected some misspellingAngelo capilleri2012-05-151-3/+3
|/ / /
* | | Merge pull request #5571 from jarkko/5559-fix-dst-jump-bug-on-masterAaron Patterson2012-05-152-0/+23
|\ \ \
| * | | [#5559] Do not black out the system timezone DST jump hour if Time.zone diffe...Jarkko Laine2012-03-242-0/+23
* | | | Remove extra `end` in arel_table docs. [ci skip]Carlos Antonio da Silva2012-05-151-8/+6
* | | | Merge pull request #6284 from acapilleri/dup_validationCarlos Antonio da Silva2012-05-152-0/+21
|\ \ \ \
| * | | | clean the erros if an object that includes validations errors is duped. Fixes...Angelo Capilleri2012-05-132-0/+21
* | | | | Revert "Revert "Remove `:disable_with` in favor of `'data-disable-with'` opti...José Valim2012-05-156-57/+13
* | | | | Revert "Remove `:disable_with` in favor of `'data-disable-with'` option from ...José Valim2012-05-156-13/+57
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-1570-341/+161
|\ \ \ \ \
| * | | | | missing dot [ci skip]Vijay Dev2012-05-151-1/+1
| * | | | | copy edit asset guide [ci skip]Vijay Dev2012-05-151-7/+5
| * | | | | Removing ==Examples and last blank lines of docs from actionpackFrancesco Rodriguez2012-05-1532-183/+56
| * | | | | code-format italicized 'production' env [ci skip]Mark Rushakoff2012-05-141-1/+1
| * | | | | s/aff/add [ci skip]Mark Rushakoff2012-05-141-1/+1
| * | | | | Add documentation for arel_tableOscar Del Ben2012-05-141-0/+8
| * | | | | Minor editing of getting started guideOscar Del Ben2012-05-141-3/+11
| * | | | | Merge branch 'master' of github.com:lifo/docrailsOscar Del Ben2012-05-14252-1613/+3273
| |\ \ \ \ \
| | * | | | | remove docs on Range#stepVasiliy Ermolovich2012-05-141-12/+0
| | * | | | | Removing ==Examples and last blank lines of docs from railtiesFrancesco Rodriguez2012-05-146-61/+0
| | * | | | | 'Netherlands locale' does not make any sense, it's Dutch locale [ci skip]Ayrton De Craene2012-05-141-2/+2
| | * | | | | Improved the readability of some sentences [ci skip]Ayrton De Craene2012-05-141-1/+1
| | * | | | | fix format in getting started guide [ci skip]Vijay Dev2012-05-141-1/+1
| | * | | | | adding examples to deep_dup methodFrancesco Rodriguez2012-05-141-1/+23
| | * | | | | Missed colonAlexey Vakhov2012-05-141-1/+1