aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Updated/changed useless tr/gsubsJurriaan Pruis2012-04-0317-20/+20
* Merge pull request #5713 from bolshakov/masterXavier Noria2012-04-031-1/+1
|\
| * Fix typoArtyom Bolshakov2012-04-031-1/+1
* | Merge pull request #5708 from romanvbabenko/refactor/add_gem_filtersAaron Patterson2012-04-021-1/+1
|\ \
| * | Unnecessary uniqueness & force mapping has been removed at BacktraceCleaner#a...Roman V. Babenko2012-04-031-1/+1
* | | Merge pull request #5695 from lest/patch-1Piotr Sarnacki2012-04-022-1/+35
|\ \ \
| * | | add type option to atom feed entry builderSergey Nartimov2012-04-012-1/+35
* | | | fix formatting in engines guide; also removed a couple of non-existent images...Vijay Dev2012-04-021-35/+25
| |_|/ |/| |
* | | Usage file in generators shouldn't be fetched only based on source_rootPiotr Sarnacki2012-04-013-5/+22
|/ /
* | Merge pull request #5694 from hardipe/masterSantiago Pastorino2012-04-011-4/+0
|\ \
| * | Useless/Confusing method definition removedhardi2012-04-011-4/+0
* | | Merge pull request #5684 from arunagw/warning_removed_railtiesVijay Dev2012-04-011-1/+1
|\ \ \
| * | | warning removed: `&' interpreted as argument prefixArun Agrawal2012-03-311-1/+1
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-0110-19/+29
|\ \ \ \ | |_|_|/ |/| | |
| * | | copy editing [ci skip]Vijay Dev2012-04-011-1/+1
| * | | :success includes the whole 200 range, not just 200.Erich Menge2012-04-012-2/+2
| * | | Reorder bits in the Layouts and Rendering guideRafaël Blais Masson2012-03-311-7/+7
| * | | Introduce minor spelling corrections and fix broken markup tag.Levi McCallum2012-03-291-3/+3
| * | | Make body background white for Lion scrollbar to be darkRafaël Blais Masson2012-03-291-3/+3
| * | | CSRF messages are no longer controlled by 422.html because InvalidAuthenticit...Tony Primerano2012-03-281-1/+0
| * | | Routing guide: document lambda constraints and request argument.Henrik N2012-03-281-0/+11
| * | | Fix quotes at select_tag examplesAnderson Dias2012-03-281-1/+1
| * | | Improved the comment for config.assets.manifest in the asset_pipeline guides.Anuj Dutta2012-03-281-1/+1
| * | | Changed the config.assets.manifest path in the comments to nil.Anuj Dutta2012-03-282-2/+2
* | | | 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