aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
| * | | Merge pull request #2616 from tilsammans/patch-2Xavier Noria2011-08-231-1/+1
| |\ \ \
| | * | | removed the link to my blog to help stop endless commentsJoost Baaij2011-08-231-1/+1
| | * | | Revert "Removed my name from the changelog as the amount of blogspam became r...Joost Baaij2011-08-231-0/+1
| | * | | Removed my name from the changelog as the amount of blogspam became ridiculous. Joost Baaij2011-08-221-1/+0
| * | | | Add destroy alias to enginesGuillermo Iguaran2011-08-221-2/+3
| * | | | Merge pull request #2411 from ai/debug_assets_by_configSantiago Pastorino2011-08-223-1/+5
| |\ \ \ \
| | * | | | Allow to debug assets by config.assets.debugAndrey A.I. Sitnik2011-08-223-1/+5
| | |/ / /
| * | | | Add Destroy AliasAndrey Ognevsky2011-08-222-1/+4
| * | | | Merge pull request #2620 from cesario/3-1-0Santiago Pastorino2011-08-211-1/+1
| |/ / /
| * | | Merge pull request #2595 from smartinez87/assets-guideSantiago Pastorino2011-08-201-0/+2
| |\ \ \
| | * | | Document debugging assets set by default for dev and test envs in the asset_p...Sebastian Martinez2011-08-191-0/+2
| * | | | minor change in the 3.1 release notesVijay Dev2011-08-201-1/+1
| |/ / /
| * | | mailer guide: fixes indentation, and use fixed width fonts wherever necessaryVijay Dev2011-08-201-31/+26
| * | | Merge branch 'master' of https://github.com/lifo/docrailsXavier Noria2011-08-1715-26/+5
| |\ \ \
| * | | | fixes generation of the AR querying guideXavier Noria2011-08-171-2/+2
| | |_|/ | |/| |
| * | | Cleanup application.cssRafa García2011-08-171-3/+3