aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
| |/
| * Bump sprockets upSantiago Pastorino2011-08-301-1/+1
| * Revert "Merge pull request #2647 from dmathieu/no_rescue"Santiago Pastorino2011-08-302-7/+7
| * Ensure correct ordering of results in test_update_all_with_joins_and_offset_a...Raimonds Simanovskis2011-08-301-1/+1
| * 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 #2750 from rsim/fix_test_column_names_are_escaped_for_oracleJon Leighton2011-08-301-1/+7
| * | Merge pull request #2636 from dasch/document-sprockets-compressorsAaron Patterson2011-08-301-7/+23
| |\ \
| | * | Document the Sprockets compressorsDaniel Schierbeck2011-08-301-7/+23
| |/ /
| * | let SDoc add a link to the source code in GitHub for each methodXavier Noria2011-08-291-0/+1
| * | Fix test failures on 1.8.7, since Object#initialize_dup is not defined there ...Jon Leighton2011-08-291-1/+0
| * | Merge pull request #2720 from biow0lf/masterXavier Noria2011-08-291-4/+4
| |\ \
| | * | Documentation fixesIgor Zubkov2011-08-291-4/+4
| * | | Merge pull request #2021 from dasch/more_postgres_utilsAaron Patterson2011-08-293-16/+21
| |\ \ \
| | * | | Make #extract_schema_and_table an instance method in UtilsDaniel Schierbeck2011-07-093-16/+21
| * | | | Move clear_timestamp_attributes into Timestamp moduleJon Leighton2011-08-292-10/+14
| * | | | The join_nodes must be passed to the JoinDependency initializer and therefore...Jon Leighton2011-08-294-13/+20
| * | | | Move the bulk alter table code into the abstract mysql adapter, hence it is s...Jon Leighton2011-08-293-47/+44
| * | | | Extract simplified_type into the abstract classJon Leighton2011-08-293-23/+24
| * | | | Create an AbstractMysqlAdapter to abstract the common code between MysqlAdapt...Jon Leighton2011-08-295-1117/+726
| * | | | Merge pull request #2724 from guilleiguaran/avoid-recursive-call-sprockets-he...Santiago Pastorino2011-08-281-2/+2
| |\ \ \ \
| | * | | | Avoid extra recursive call in Sprockets helpersGuillermo Iguaran2011-08-281-2/+2
| |/ / / /
| * | | | Merge pull request #2723 from guilleiguaran/3-1-0-changelogsSantiago Pastorino2011-08-283-0/+27
| * | | | fixing typoAaron Patterson2011-08-281-1/+1
| * | | | Bump rack-cache, rack-test, rack-mount and sprockets upSantiago Pastorino2011-08-281-4/+4
| * | | | clear and disable query cache when an exception is raised from called middlewareAaron Patterson2011-08-282-1/+33
| | |/ / | |/| |
| * | | Merge pull request #2711 from dasch/patch-3Aaron Patterson2011-08-281-14/+3
| |\ \ \
| | * | | Refactor ActionDispatch::Http::UploadedFileDaniel Schierbeck2011-08-281-14/+3
| |/ / /
| * | | deletes spurious arrowXavier Noria2011-08-271-1/+1
| * | | Merge pull request #2714 from vijaydev/docsSantiago Pastorino2011-08-273-15/+19
| |\ \ \
| | * | | doc fixesVijay Dev2011-08-283-15/+19
| |/ / /
| * | | use sdoc to generate the APIXavier Noria2011-08-272-2/+4
| * | | stop messing with the load path, load path should be adjusted in the test taskAaron Patterson2011-08-261-7/+0
| * | | Merge pull request #2702 from arunagw/removed_unused_varSantiago Pastorino2011-08-261-1/+1
| |\ \ \
| | * | | Removed Unused Variable. Arun Agrawal2011-08-261-1/+1
| |/ / /
| * | | Merge pull request #2699 from guilleiguaran/fix-asset-debugging-test-1.8Aaron Patterson2011-08-251-1/+1
| |\ \ \
| | * | | Fix failing asset debug test under 1.8Guillermo Iguaran2011-08-251-1/+1
| |/ / /
| * | | Force binary data inserted for a string data type to utf-8 and log anAaron Patterson2011-08-252-3/+34
| * | | 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
| | | |/ | | |/|