aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
...
* | 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-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 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.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
|\ \ \
| * | | incorporate feedback from vijaydev and dasch to rephrase this to sound more n...Waynn Lue2011-08-261-4/+4
* | | | Merge pull request #2720 from biow0lf/masterXavier Noria2011-08-291-4/+4
|\ \ \ \
| * | | | Documentation fixesIgor Zubkov2011-08-291-4/+4
| | |/ / | |/| |
* / | | Merge pull request #2723 from guilleiguaran/3-1-0-changelogsSantiago Pastorino2011-08-281-0/+13
|/ / /
* | | Fix failing asset debug test under 1.8Guillermo Iguaran2011-08-251-1/+1
* | | Merge pull request #2681 from guilleiguaran/doc-changesXavier Noria2011-08-252-1/+12
|\ \ \
| * | | Update Debugging Assets section of Assets Pipeline guideGuillermo Iguaran2011-08-251-1/+8
| * | | Add missing CHANGELOG entries for RailtiesGuillermo Iguaran2011-08-251-0/+4
| |/ /
* | | Revert all the stuff to do with disallowing non-public methods for Module#del...Jon Leighton2011-08-251-24/+0
* | | Yes we need this to pass the test. we are using config.log_level.Arun Agrawal2011-08-251-2/+2
* | | Merge pull request #2688 from dasch/refactor-asset-debugging-testsAaron Patterson2011-08-252-42/+56
|\ \ \
| * | | Move asset debugging tests into a separate test caseDaniel Schierbeck2011-08-252-42/+56
| |/ /
* | | Moved strict validation changelog entry to right placeBogdan Gusiev2011-08-252-1/+1
* | | Merge pull request #2563 from bogdan/internal_validationJosé Valim2011-08-252-2/+6
|\ \ \ | |/ / |/| |
| * | Add strict validation example to guidesBogdan Gusiev2011-08-242-2/+6
* | | fix ambiguous * and remove unused variableAaron Patterson2011-08-241-2/+2
* | | fix ambiguous use of *Aaron Patterson2011-08-241-1/+1
* | | only define the encoding reader since we define the writer later onAaron Patterson2011-08-241-1/+2
* | | we are *sure* we want to set the encoding, so silence warnings around itAaron Patterson2011-08-242-4/+9
* | | the command line guide is good to goXavier Noria2011-08-241-1/+1
* | | dealing with some -w warnings on startupAaron Patterson2011-08-244-2/+9
* | | Add config.allow_debugging option to determine if the debug_assets query para...Guillermo Iguaran2011-08-244-6/+55
* | | Merge pull request #2390 from arunagw/test_for_environment_fileSantiago Pastorino2011-08-241-0/+9
|\ \ \
| * | | Test added to check mass_assignment_sanitizer is not present if --skip-active...Arun Agrawal2011-08-031-0/+9
* | | | Remove extra word from sentence in initialization guide.Brian Morearty2011-08-231-1/+1