aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Improve examples: use each instead of for...inGabe Berke-Williams2011-08-312-2/+2
* 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
| * | | Backport f443f9cb0c64 to masterGuillermo Iguaran2011-08-318-52/+41
| * | | Backport b0f30631662 to masterGuillermo Iguaran2011-08-311-3/+2
| * | | Read digests of assets from manifest.yml if config.assets.manifest is onGuillermo Iguaran2011-08-316-6/+105
|/ / /
* | | Revert "Ruby 1.8.7+ provides to_date/to_datetime, AS just makes them public."...Chris Griego2011-08-311-0/+22
* | | Always enable digest and compile in the Rake taskGuillermo Iguaran2011-08-311-2/+3
* | | 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
|/ / /
* | | 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