aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Unnecessary uniqueness & force mapping has been removed at BacktraceCleaner#a...Roman V. Babenko2012-04-031-1/+1
* Merge pull request #5691 from avakhov/form-label-blockJosé Valim2012-04-012-3/+17
|\
| * Small #label method refactoring, thanks @rafaelfrancaAlexey Vakhov2012-04-011-3/+2
| * Block version of label should wrapped in field_with_errors in case of errorAlexey Vakhov2012-04-012-1/+16
* | Merge pull request #5690 from nertzy/remove_naming_deprecation_includeJosé Valim2012-04-011-1/+0
|\ \
| * | Don't include deprecation in AM::Naming anymoreGrant Hutchins2012-03-311-1/+0
| |/
* | Merge pull request #5692 from avakhov/force-ssl-if-testJosé Valim2012-04-011-0/+23
|\ \ | |/ |/|
| * Tests :if option of force_ssl methodAlexey Vakhov2012-04-011-0/+23
|/
* use undef_method to avoid NameError exceptions all the timeAaron Patterson2012-03-311-5/+1
* Remove not needed requiresSantiago Pastorino2012-03-312-2/+0
* Merge pull request #5683 from arunagw/buffered_logger_testSantiago Pastorino2012-03-311-3/+1
|\
| * no more deprecation required.Arun Agrawal2012-03-311-2/+0
| * No more BufferedLogger so it can be LoggerTestArun Agrawal2012-03-311-1/+1
|/
* Merge pull request #5679 from arunagw/warning_removed_masterVijay Dev2012-03-311-1/+1
|\
| * warning removed: (...) interpreted as grouped expressionArun Agrawal2012-03-311-1/+1
* | Merge pull request #5664 from lest/patch-1Piotr Sarnacki2012-03-311-2/+2
|\ \
| * | use `symbolize_keys` instead of `dup.symbolize_keys!`Sergey Nartimov2012-03-301-2/+2
* | | Merge pull request #5674 from avakhov/ac-exception-remove-obsolete-memberSantiago Pastorino2012-03-311-2/+0
|\ \ \ | |_|/ |/| |
| * | Remove obsolete reader from AC::MethodNotAllowed exception classAlexey Vakhov2012-03-311-2/+0
* | | use tsort_each to avoid intermediary arrayAaron Patterson2012-03-301-1/+1
* | | Merge pull request #4911 from Floppy/masterAaron Patterson2012-03-302-1/+11
|\ \ \ | |/ / |/| |
| * | Change FILENAME_MAX_SIZE in FileStore to 228.James Smith2012-02-062-1/+11
* | | Merge pull request #5673 from avakhov/ac-render-exceptionPiotr Sarnacki2012-03-301-3/+0
|\ \ \
| * | | Remove AC::RenderError class second declarationAlexey Vakhov2012-03-311-3/+0
|/ / /
* | | Fix #5667. Preloading should ignore scoping.Jon Leighton2012-03-302-2/+14
* | | Remove the leading \n added by textarea on assert_selectSantiago Pastorino2012-03-303-0/+10
* | | clear up duplication between Persistence#destroy and Locking#destroyJon Leighton2012-03-302-27/+34
* | | fix testJon Leighton2012-03-301-1/+2
* | | whitespace :scissors:Jon Leighton2012-03-302-5/+4
* | | Merge pull request #5334 from courtland/masterJon Leighton2012-03-305-1/+27
|\ \ \
| * | | Tests for removing a HABTM association when optimistic locking is enabled.Nick Rogers2012-03-074-1/+25
| * | | Fix deleting from a HABTM join table upon destroying an object of a model wit...Nick Rogers2012-03-071-0/+2
* | | | Merge pull request #5668 from plashchynski/validate_attribute_name_in_class_a...José Valim2012-03-304-0/+32
|\ \ \ \
| * | | | validate attribute names in class and module attribute accessorsDmitry Plashchynski2012-03-304-0/+32
* | | | | fix typo. thanks @nertzyJon Leighton2012-03-301-1/+1
|/ / / /
* | | | Update guides to reflect 0a12a5f8169685915cbb7bf4d0a7bb482f7f2fd2Jon Leighton2012-03-301-20/+10
* | | | remove irrelevant references to ARelJon Leighton2012-03-301-2/+2
* | | | Add Relation#find_by and Relation#find_by!Jon Leighton2012-03-306-0/+114
* | | | Merge pull request #2945 from Casecommons/nested_attributes_moduleJon Leighton2012-03-303-1/+15
|\ \ \ \
| * | | | Nested attribute setters can be overridden.Jonathan Mukai & Peter Jaros2012-03-283-1/+15
* | | | | recurse in read_attribute we get caching / don't duplicate codeJon Leighton2012-03-301-3/+2
| |_|_|/ |/| | |
* | | | Merge pull request #5661 from carlosantoniodasilva/ar-pk-typecastAaron Patterson2012-03-293-5/+8
|\ \ \ \
| * | | | Deprecate Column#type_cast_codeCarlos Antonio da Silva2012-03-292-4/+4
| * | | | Properly typecast id attribute when using custom primary keyCarlos Antonio da Silva2012-03-291-1/+4
|/ / / /
* | | | Merge pull request #5345 from guilleiguaran/ar-sliceJeremy Kemper2012-03-293-0/+23
|\ \ \ \
| * | | | CHANGELOG entry for AR#sliceGuillermo Iguaran2012-03-291-0/+5
| * | | | Add ActiveRecord::Base#slice to slice method callsGuillermo Iguaran2012-03-292-0/+18
|/ / / /
* | | | Merge pull request #5617 from Empact/pathsAaron Patterson2012-03-292-9/+1
|\ \ \ \
| * | | | Define Paths::Root#[]= in terms of #add.Ben Woosley2012-03-291-2/+1
| * | | | Drop Paths::Root initializer check of #path as it isn't checked in the #path=...Ben Woosley2012-03-292-5/+0