aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-025-70/+161
|\ \ \
| * | | Revert "Fixing guides validation errors."Vijay Dev2011-09-0210-24/+18
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d20281add192e5afba66e555ce67cf73943b033b. Reason: This needs more investigation. Will apply when this is verified.
| * | | 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 ↵Stephen J. Butler2011-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | former breaks the HTML generation).
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 30d65da17e5fb1cdd3f10a6d14f4295b57e26286. Reason: This commit is incorrect. It is indeed recommended to use update_attribute when you want callbacks to be invoked.
| * | | | Modified ActionMailer Basics doc with the following change:Andy Leeper2011-09-011-2/+3
| | | | | | | | | | | | | | | | | | | | * Changed the lines that said <tt>config/environments/env.rb</tt> to <tt>config/environments/$RAILS_ENV.rb</tt>. People were mis-interpreting the filename to literally be env.rb.
| * | | | Change "SCSS" to "Sass" in sentences where it's referred to as "language", ↵Roy Tomeij2011-09-011-5/+5
| |/ / / | | | | | | | | | | | | because Sass is the language (SCSS is one possible syntax within the Sass language), as per documentation on sass-lang.com.
| * | | Move css data URI into css/erb sectionRichard Hulse2011-09-011-8/+8
| | | |
| * | | pipeline docs improvementRichard Hulse2011-09-011-20/+25
| | | | | | | | | | | | | | | | | | | | Some cleaning up of whitespace/punctuation and text refinements to clarify some things.
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Production section has been changed to reflect the new default of precompilation and using the asset manifest. Development has been swapped around to reflect the new default (debug mode is on). Other changes to support this elsewhere.
| * | | 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 ↵Sam Pohlenz2011-09-011-0/+26
| | | | | | | | | | | | | | | | is false
* | | | Merge pull request #2780 from guilleiguaran/assets-pipeline-minor-changesSantiago Pastorino2011-08-312-1/+14
| | | | | | | | | | | | | | | | Assets pipeline: fix in manifest location and remove unused code
* | | | 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 ↵Greg Leppert2011-08-311-1/+1
| | | | | | | | | | | | | | | | above.
| * | | make code example agree with text just aboveRay Baxter2011-08-311-1/+1
| | | |
* | | | Instructions for nginx and apache addedKir2011-08-311-2/+28
|/ / /
* | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-08-312-3/+50
|\ \ \
| * | | Add section to pipeline docs to help people upgradingRichard Hulse2011-09-011-0/+47
| | | | | | | | | | | | | | | | These are the options from a brand new app, and should help people get it right when upgrading.
| * | | Fixing spelling, throught -> through.Andrew Olson2011-08-311-1/+1
| | | |
| * | | Fix logic in 3.1 release notes sentenceRodrigo Rosenfeld Rosas2011-08-311-1/+1
| | | |
| * | | Merge branch 'master' of git://github.com/rails/railsXavier Noria2011-08-3138-136/+282
| |\ \ \
| * | | | Fix typo: => instead of =Semyon Perepelitsa2011-08-311-1/+1
| | | | |
* | | | | Fix asset debugging tests to reflect last changes in 3-1-stableGuillermo Iguaran2011-08-311-9/+18
| | | | |
* | | | | Set default location of manifest with config.assets.manifestGuillermo Iguaran2011-08-313-0/+21
| | | | |
* | | | | Backport f443f9cb0c64 to masterGuillermo Iguaran2011-08-314-22/+24
| | | | |
* | | | | Backport b0f30631662 to masterGuillermo Iguaran2011-08-311-3/+2
| | | | |
* | | | | Read digests of assets from manifest.yml if config.assets.manifest is onGuillermo Iguaran2011-08-313-4/+74
| | | | |
* | | | | Merge pull request #2706 from mitio/doc-changesVijay Dev2011-08-311-11/+11
|\ \ \ \ \ | |_|/ / / |/| | | | Fixed some typos and made minor text changes in the Plugins guide.
| * | | | Fixed typos and made minor changes in the Plugins guide.Dimitar Dimitrov2011-08-271-11/+11
| | |/ / | |/| |
* | | | syncs assets guide with what's in 3-1-stableXavier Noria2011-08-311-11/+27
| | | |
* | | | Merge pull request #2761 from raybaxter/bump_api_urlXavier Noria2011-08-311-1/+1
|\ \ \ \ | | | | | | | | | | don't need edgeapi now that we are on 3.1
| * | | | don't need edgeapi now that we are on 3.1Ray Baxter2011-08-301-1/+1
| | | | |
* | | | | release notes: adds a couple of blank lines to get the markup rightXavier Noria2011-08-311-0/+2
| | | | |
* | | | | adds the release notes of 3.1 to the indexXavier Noria2011-08-312-0/+5
|/ / / /
* | | | adds the asset pipeline guide to the indexXavier Noria2011-08-303-2/+7
| | | |
* | | | Merge pull request #2684 from waynn/patch-2Xavier Noria2011-08-301-4/+4
|\ \ \ \ | | | | | | | | | | Rephrasing to sound more natural, and some grammar fixes.