aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5535 from markmcspadden/issue_5527_rollbacksAaron Patterson2012-05-162-1/+46
|\ | | | | Allow manual rollbacks in after_save to reset object correctly
| * Allow manual rollbacks in after_save to reset object correctlyMark McSpadden2012-03-212-1/+46
| |
* | Load all the env files available in config.paths (closes #6335)Piotr Sarnacki2012-05-163-3/+14
| |
* | Merge pull request #6337 from bcardarella/patch-1Aaron Patterson2012-05-161-1/+1
|\ \ | | | | | | Changing the indentation level of the block comment close for Sass
| * | Changing the indentation level of the block comment close for SASS Brian Cardarella2012-05-151-1/+1
| | | | | | | | | If one wants to use use SASS for application.css.sass the comment block indentation is invalid.
* | | assuming there is only one column, we can simplify the type cast loopAaron Patterson2012-05-161-7/+6
| | |
* | | MySQL returns "SUM(DISTINCT(credit_limit))" as the column name unlessAaron Patterson2012-05-162-5/+16
| | | | | | | | | | | | | | | an alias is provided. Without the alias, the column cannot be found and properly typecast.
* | | remove stray text in getting started guide [ci skip]Vijay Dev2012-05-171-4/+4
| | |
* | | Revert "Merge pull request #6354 from lest/patch-1"Carlos Galdino + Rafael Mendonça França2012-05-163-1/+5
| | | | | | | | | | | | | | | | | | | | | This reverts commit e8feaff60b9c04d34ad234f7d17b5d2ad9cc7a24, reversing changes made to 9adf28c026070afb78b80027521a4ddddd68d697. Reason: This broke the actionmailer tests
* | | document the AR::Base#ids method introduced in 9307616 [ci skip]Vijay Dev2012-05-171-0/+18
| | |
* | | Merge pull request #6354 from lest/patch-1Rafael Mendonça França2012-05-163-5/+1
|\ \ \ | | | | | | | | remove unnecessary require
| * | | remove unnecessary requireSergey Nartimov2012-05-163-5/+1
| | | | | | | | | | | | | | | | | | | | - access & filters don't use multibyte ext - transliterate requires only AS::Multibyte but not multibyte ext
* | | | fix bad formatting [ci skip]Vijay Dev2012-05-171-2/+2
|/ / /
* | | Merge pull request #6136 from mhfs/sqlbypass_fixesAaron Patterson2012-05-162-5/+15
|\ \ \ | | | | | | | | Bring SqlByPassTest to light and fix broken tests
| * | | Rename test file so that the test suite matches it, implement `persisted?` ↵Marcelo Silveira2012-05-162-5/+15
| |/ / | | | | | | | | | for SqlBypass as expected by tests and convert session_id to string before using on queries to get correct quotes on postgresql (avoid casting error).
* | | Merge pull request #6349 from erichmenge/patch-raise-type-errorsAaron Patterson2012-05-164-7/+34
|\ \ \ | | | | | | | | Integer limit out of range should be allowed to raise. Closes #6272
| * | | Integer limit out of range should be allowed to raise. Closes #6272Erich Menge2012-05-164-7/+34
| |/ /
* | | Merge pull request #6353 from nashby/safe-interpolationAaron Patterson2012-05-162-0/+38
|\ \ \ | | | | | | | | fix safe string interpolation with SafeBuffer#%
| * | | fix safe string interpolation with SafeBuffer#%, closes #6352Vasiliy Ermolovich2012-05-162-0/+38
| | | |
* | | | Merge pull request #6336 from erichmenge/patch-pluck-fragmentCarlos Antonio da Silva2012-05-162-8/+6
|\ \ \ \ | |/ / / |/| | | Fixes issue where SQL fragments prevented type casting based on column
| * | | Fixes issue where SQL fragments prevented type casting based on column type.Erich Menge2012-05-162-8/+6
| |/ /
* | | 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 changelog
| * | | Fix misprint in AR changelogAlexey Vakhov2012-05-161-1/+1
| | | |
* | | | Fix tests in railtiesPiotr Sarnacki2012-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `bundle install` was fixed in `rails plugin new`, it now requires `rails 4.0.0.beta` version in filesystem when running tests. Instead of providing it, we can run tested command with `--dev` option, to use rails from the local directory.
* | | | 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.
| * | | 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 adapter
| * | | 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
|\ \ \ | |/ / |/| | Bump sqlite3 gem
| * | 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
|\ \ \ | | | | | | | | Feature/simple format refactoring
| * | | Added the wrapper tag option to simple_formatAvi Tzurel2012-05-142-2/+12
| | | |
| * | | simple_format refactoringAvi Tzurel2012-05-141-9/+17
| | | | | | | | | | | | | | | | | | | | using split_paragraphs method and content_tag instead of string concatination
* | | | Merge pull request #6333 from carlosgaldino/unnecessary-callRafael Mendonça França2012-05-151-1/+1
|\ \ \ \ | | | | | | | | | | Remove unnecessary calls to primary_key on sqlite3_adapter
| * | | | 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.
| * | | | Remove unnecessary assertions. We should only test the before_seq isn't same ↵kennyj2012-05-161-5/+1
| | | | | | | | | | | | | | | | | | | | to the after_seq when using sequencer.
* | | | | Merge pull request #6327 from nashby/string-interpolationCarlos Antonio da Silva2012-05-153-17/+0
|\ \ \ \ \ | | | | | | | | | | | | remove backported string interpolation
| * | | | | 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 misspelling
| * | | | 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 ...
| * | | | [#5559] Do not black out the system timezone DST jump hour if Time.zone ↵Jarkko Laine2012-03-242-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | differs from that. The system timezone DST jump hour should not be blacked out by Time.zone.parse if current Time.zone does not do the jump at that time. Fixes #5559.
* | | | | Remove extra `end` in arel_table docs. [ci skip]Carlos Antonio da Silva2012-05-151-8/+6
| | | | | | | | | | | | | | | | | | | | Introduced in 7ecfe3d30ccfaee8dcca4ee649cc006c090bdfb4
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 01:35:28 +0000