aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5733 from oscardelben/patch-5Santiago Pastorino2012-04-041-2/+0
|\ | | | | No need to extend ActiveSupport::Extend here
| * No need to extend ActiveSupport::Extend hereOscar Del Ben2012-04-041-2/+0
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-048-25/+83
|\ | | | | | | | | Conflicts: guides/source/engines.textile
| * Revert "rails 4 will support ruby version 1.9.4 or higher"Vijay Dev2012-04-041-1/+1
| | | | | | | | | | | | This reverts commit 0a35acb8b89603a3135852742f206af82ed61b57. Reason: Let's cross the bridge when we reach there.
| * Fix AC responder exampleAlexey Vakhov2012-04-041-1/+1
| |
| * typo mistake fixedSandip Ransing2012-04-041-2/+2
| | | | | | | | correction to server stop statement added
| * rails 4 will support ruby version 1.9.4 or higherSandip Ransing2012-04-041-1/+1
| |
| * Fixed small typoFernando Briano2012-04-031-1/+1
| |
| * also <text> replaced by <plain>Mikhail Dieterle2012-04-041-4/+4
| |
| * Changed engines guide not to use a css tag. <plain> will do just fine. Mikhail Dieterle2012-04-031-2/+2
| | | | | | https://github.com/lifo/docrails/commit/bb23d6fb005edaf25f5b294f9215429fb44b3f3d
| * Remove non-obligatory params in AC respond_to examplesAlexey Vakhov2012-04-031-2/+2
| |
| * Remove unnecessary articles.Waseem Ahmad2012-04-031-3/+3
| |
| * Merge branch 'master' of github.com:lifo/docrailsHrvoje Šimić2012-04-022-2/+2
| |\
| | * Revert "parse <css> block as code (used in engines guide) "Vijay Dev2012-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | This reverts commit c46374a9d949004761d71570a4d703838c694e74. Reason: Changed engines guide not to use a css tag. <plain> will do just fine.
| | * wrong link to getting started guideMikhail Dieterle2012-04-031-1/+1
| | |
| * | update purpose of middlewareHrvoje Šimić2012-04-021-11/+66
| |/
| * update to current rack middleware stackHrvoje Šimić2012-04-021-3/+6
| |
| * parse <css> block as code (used in engines guide) Mikhail Dieterle2012-04-021-1/+1
| |
| * Correct invalid route example [ci skip]Cezary Baginski2012-04-021-1/+1
| |
* | the file update checker now also detects removed filesXavier Noria2012-04-032-26/+40
| |
* | DATABASE_URL allows omission of database.ymlTim Pope2012-04-031-1/+3
| |
* | use File.binread to pull in the schema cacheAaron Patterson2012-04-032-2/+2
| |
* | Merge pull request #5723 from tiegz/minor_fixesJosé Valim2012-04-031-1/+1
|\ \ | | | | | | minor elsif/else typo fix
| * | minor elsif/else typo fixTieg Zaharia2012-04-031-1/+1
|/ /
* | Merge pull request #5713 from bolshakov/masterXavier Noria2012-04-031-1/+1
|\ \ | | | | | | Fix typo in "dasherize" description
| * | 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 BacktraceClea...
| * | | Unnecessary uniqueness & force mapping has been removed at ↵Roman V. Babenko2012-04-031-1/+1
| | | | | | | | | | | | | | | | BacktraceCleaner#add_gem_filters
* | | | Merge pull request #5695 from lest/patch-1Piotr Sarnacki2012-04-022-1/+35
|\ \ \ \ | | | | | | | | | | add type option to atom feed entry builder
| * | | | add type option to atom feed entry builderSergey Nartimov2012-04-012-1/+35
| | | | | | | | | | | | | | | | | | | | closes #5672
* | | | | fix formatting in engines guide; also removed a couple of non-existent ↵Vijay Dev2012-04-021-35/+25
| |_|/ / |/| | | | | | | | | | | images [ci skip]
* | | | Usage file in generators shouldn't be fetched only based on source_rootPiotr Sarnacki2012-04-013-5/+22
|/ / / | | | | | | | | | | | | | | | | | | | | | In case `source_roout` is not set, `default_source_root` is used, which includes also `templates` directory. If there is no `templates` directory, `default_source_root` is not available and USAGE will not be displayed. USAGE should be also checked based on default directory excluding `templates`.
* | | Merge pull request #5694 from hardipe/masterSantiago Pastorino2012-04-011-4/+0
|\ \ \ | | | | | | | | Tidy up cookies.rb a bit
| * | | 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 prefix
| * | | 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
| | | | | | | | | | | | | | | | | | | | # File lib/rack/response.rb, line 114 114: def successful?; @status >= 200 && @status < 300; end
| * | | 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 ↵Tony Primerano2012-03-281-1/+0
| | | | | | | | | | | | | | | | InvalidAuthenticityToken is not raised
| * | | 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
|\ \ \ \ | | | | | | | | | | Block version of label should wrapped in field_with_errors in case of error
| * | | | 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
| | |_|/ | |/| |