aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Modified ActionMailer Basics doc with the following change:Andy Leeper2011-09-011-2/+3
| * | | Merge pull request #62 from roytomeij/masterVijay Dev2011-09-011-5/+5
| |\ \ \
| | * | | Change "SCSS" to "Sass" in sentences where it's referred to as "language", be...Roy Tomeij2011-09-011-5/+5
| |/ / /
| * / / docs formatting changesVijay Dev2011-09-013-4/+4
| |/ /
| * | 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
| * | Merge pull request #61 from gabebw/masterXavier Noria2011-08-312-2/+2
| |\ \
| | * | Improve examples: use each instead of for...inGabe Berke-Williams2011-08-312-2/+2
| |/ /
* | / Remove hard dependency on bcrypt.Guillermo Iguaran2011-09-023-3/+4
| |/ |/|
* | Merge pull request #2811 from avakhov/fix-environment-generator-actionJosé Valim2011-09-022-2/+2
|\ \
| * | fix indent for generator environment methodAlexey Vakhov2011-09-022-2/+2
|/ /
* | * Psych errors with poor yaml formatting are proxied. Fixes #2645, #2731Aaron Patterson2011-09-013-2/+27
* | make sure encoding_aware? is availableAaron Patterson2011-09-011-0/+2
* | CookieJar is enumerable. fixes #2795Aaron Patterson2011-09-013-0/+23
* | Merge pull request #2775 from jaw6/fix/reverseAaron Patterson2011-09-012-4/+7
|\ \
| * | Fixes bug in ActiveRecord::QueryMethods, #1697Joshua Wehner2011-08-312-4/+7
* | | Merge pull request #2718 from dasch/patch-5Vijay Dev2011-09-011-1/+4
|\ \ \
| * | | Split long string into multiple shorter ones Daniel Schierbeck2011-08-291-1/+4
* | | | Merge pull request #2585 from marcgg/fix-ruby19-splitoptionsJosé Valim2011-09-012-1/+20
|\ \ \ \
| * | | | Do not use objects that don't respond to to_sym (integers, floats, dates...) ...Marc G Gauthier2011-09-012-1/+20
| * | | | Do not try to use as a parameter elements that are not acceptableMarc G Gauthier2011-08-191-1/+1
* | | | | Merge pull request #2788 from spohlenz/precompile-without-digests-masterJosé Valim2011-09-012-4/+31
|\ \ \ \ \
| * | | | | assets:precompile should not append asset digests when config.assets.digest i...Sam Pohlenz2011-09-012-4/+31
|/ / / / /
* | | | | Merge pull request #2787 from guilleiguaran/changelogs-3-1-1-masterJosé Valim2011-09-011-1/+10
|\ \ \ \ \
| * | | | | Add missing changelog entries for 3.1.1Guillermo Iguaran2011-09-011-1/+10
* | | | | | Merge pull request #2786 from spohlenz/extract-asset-paths-config-masterJosé Valim2011-09-011-5/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Move references to Rails.application.config out of Sprockets AssetPathsSam Pohlenz2011-09-011-5/+14
|/ / / / /
* | | | | Merge pull request #2780 from guilleiguaran/assets-pipeline-minor-changesSantiago Pastorino2011-08-313-21/+27
* | | | | 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
* | | | | 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
| * | | | 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-31177-1815/+2490
| |\ \ \ \
| * | | | | Fix typo: => instead of =Semyon Perepelitsa2011-08-311-1/+1
* | | | | | Merge pull request #2772 from guilleiguaran/backports-assets-pipelineJosé Valim2011-08-3110-36/+160
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 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-315-2/+30