aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Merge docrails, resolving conflicts in the assets guideVijay Dev2011-09-049-24/+26
|\
| * minor fixes in assets guideVijay Dev2011-09-041-11/+9
| * Added |t| to create_table blockRinaldi Fonseca2011-09-041-1/+1
| * add some missing dots in the docsVijay Dev2011-09-041-4/+4
| * Fix asset_path example in CSS and ERB sectionGuillermo Iguaran2011-09-021-1/+1
| * document send_file guesses content type from the file extensionVijay Dev2011-09-031-1/+3
| * fix YUI descriptionRichard Hulse2011-09-031-1/+1
| * Fixed a typo in the section about migration.David Peckham2011-09-021-1/+1
| * some of the changes for validation earlier reverted from d20281aVijay Dev2011-09-033-4/+6
| * Change photos_path to photos_url in Using redirect_toFranco Catena2011-09-021-1/+1
* | Merge pull request #2841 from wojtekmach/app-generators-groupJosé Valim2011-09-044-1/+61
|\ \
| * | Add gem_group support to generatorsWojciech Mach2011-09-044-1/+61
* | | Merge pull request #2816 from sikachu/content_tag_forJosé Valim2011-09-041-0/+77
|\ \ \
| * | | Make `content_tag_for` and `div_for` accepts the array of recordsPrem Sichanugrist2011-09-041-0/+77
* | | | Remove useless parensSantiago Pastorino2011-09-041-1/+1
* | | | Modified content in guides and commentsArun Agrawal2011-09-043-6/+6
* | | | Warnings removed for "assert_match /" Please doArun Agrawal2011-09-046-25/+25
* | | | Warnings removed for using shadow variable.Arun Agrawal2011-09-042-4/+4
* | | | restores the API docs of AR::Fixtures, made a quick pass over them, revises l...Xavier Noria2011-09-031-1/+1
| |/ / |/| |
* | | Add bcrypt-ruby to Gemfile templateGuillermo Iguaran2011-09-031-0/+3
|/ /
* / fixes CSS example in the asset pipeline guideXavier Noria2011-09-031-1/+1
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-025-70/+161
|\
| * Revert "Fixing guides validation errors."Vijay Dev2011-09-0210-24/+18
| * debug option to js, stylesheet tags are ignored when debug mode is offVijay Dev2011-09-021-1/+1
| * Merge branch 'fix_validation_errors'Andrew Olson2011-09-0210-17/+23
| |\
| | * Fixing guides validation errors.Andrew Olson2011-09-0210-18/+24
| * | When a collection is empty, render returns nil.Matt Burke2011-09-021-0/+7
| * | Change the styling of '<ruby>initialize</ruby>' to '+initialize+' (the former...Stephen J. Butler2011-09-011-1/+1
| * | fix some minor omissions in pipeline docsRichard Hulse2011-09-021-5/+18
| * | Add #update_attributes as another alternative to #update_column.Sebastian Martinez2011-09-011-1/+1
| * | Revert "Fix logic in 3.1 release notes sentence"Vijay Dev2011-09-011-1/+1
| * | Modified ActionMailer Basics doc with the following change:Andy Leeper2011-09-011-2/+3
| * | Change "SCSS" to "Sass" in sentences where it's referred to as "language", be...Roy Tomeij2011-09-011-5/+5
| |/
| * Move css data URI into css/erb sectionRichard Hulse2011-09-011-8/+8
| * pipeline docs improvementRichard Hulse2011-09-011-20/+25
| * pipeline docs - spelling and some whitespaceRichard Hulse2011-09-011-5/+5
| * Adding reference about ExecJS for CoffeeScriptGuillermo Iguaran2011-09-011-2/+4
| * Add reference to ExecJS in JavaScript Compression sectionGuillermo Iguaran2011-09-011-1/+3
| * Fixing sass-rails helpers methods examplesGuillermo Iguaran2011-09-011-4/+4
| * Giving info about what are the defaults for test environmentGuillermo Iguaran2011-09-011-1/+1
| * update pipeline docs to reflect new defaultsRichard Hulse2011-09-011-32/+93
| * Review config.assets options.Guillermo Iguaran2011-08-311-1/+1
* | fix indent for generator environment methodAlexey Vakhov2011-09-022-2/+2
* | assets:precompile should not append asset digests when config.assets.digest i...Sam Pohlenz2011-09-011-0/+26
* | Merge pull request #2780 from guilleiguaran/assets-pipeline-minor-changesSantiago Pastorino2011-08-312-1/+14
* | should be using a / in this route rather than a #Aaron Patterson2011-08-311-1/+1
|/
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-08-313-2/+14
|\
| * Added new asset config options to guidesRichard Hulse2011-09-011-0/+12
| * Update wording surrounding template file extensions to include Rails 3 and ab...Greg Leppert2011-08-311-1/+1
| * make code example agree with text just aboveRay Baxter2011-08-311-1/+1