aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | incorporate feedback from vijaydev and dasch to rephrase this to sound more ↵Waynn Lue2011-08-261-4/+4
| | | | | | | | | | | | | | | | natural, and some grammar fixes.
* | | | Merge pull request #2720 from biow0lf/masterXavier Noria2011-08-291-4/+4
|\ \ \ \ | | | | | | | | | | Doc fixes
| * | | | Documentation fixesIgor Zubkov2011-08-291-4/+4
| | |/ / | |/| |
* / | | Merge pull request #2723 from guilleiguaran/3-1-0-changelogsSantiago Pastorino2011-08-281-0/+13
|/ / / | | | | | | | | | Update changelogs for Rails 3.1.0
* | | 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
|\ \ \ | | | | | | | | Documentation changes: Assets Pipeline guide and Railties changelog
| * | | 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 ↵Jon Leighton2011-08-251-24/+0
| | | | | | | | | | | | Module#delegate
* | | Yes we need this to pass the test. we are using config.log_level.Arun Agrawal2011-08-251-2/+2
| | | | | | | | | | | | | | | Fix broken test test_copying_migrations(RailtiesTest::EngineTest): NoMethodError: undefined method `log_level' for #<Rails::Engine::Configuration:0xb87a98c>
* | | Merge pull request #2688 from dasch/refactor-asset-debugging-testsAaron Patterson2011-08-252-42/+56
|\ \ \ | | | | | | | | Refactor asset debugging tests
| * | | Move asset debugging tests into a separate test caseDaniel Schierbeck2011-08-252-42/+56
| |/ / | | | | | | | | | | | | | | | | | | Also: - Refactor AssetDebuggingTest. - Use the %r regexp syntax. That way we don't need to escape the /'s.
* | | 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
|\ \ \ | |/ / |/| | Implemented strict validation concept
| * | 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 ↵Guillermo Iguaran2011-08-244-6/+55
| | | | | | | | | | | | param can be passed by user