aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* assets:precompile should not append asset digests when config.assets.digest ↵Sam Pohlenz2011-09-012-4/+31
| | | | is false
* Merge pull request #2787 from guilleiguaran/changelogs-3-1-1-masterJosé Valim2011-09-011-1/+10
|\ | | | | Add missing changelog entries for 3.1.1
| * Add missing changelog entries for 3.1.1Guillermo Iguaran2011-09-011-1/+10
| |
* | Merge pull request #2786 from spohlenz/extract-asset-paths-config-masterJosé Valim2011-09-011-5/+14
|\ \ | |/ |/| Remove explicit references to Rails.application.config from AssetPaths in Sprockets helper
| * Move references to Rails.application.config out of Sprockets AssetPathsSam Pohlenz2011-09-011-5/+14
|/
* Merge pull request #2780 from guilleiguaran/assets-pipeline-minor-changesSantiago Pastorino2011-08-313-21/+27
| | | | 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-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
|\ \ \ | | | | | | | | Backports of the assets pipeline changes done in 3-1-stable
| * | | 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 ↵Chris Griego2011-08-311-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | public." to support date implementations without private to_date/to_datetime on Time (home_run). This reverts commit 080345baca1076a9788dff4803153600aec31f86. Signed-off-by: José Valim <jose.valim@gmail.com>
* | | 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 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
|/ / /
* | | Bump sprockets upSantiago Pastorino2011-08-301-1/+1
| | |
* | | Revert "Merge pull request #2647 from dmathieu/no_rescue"Santiago Pastorino2011-08-302-7/+7
| | | | | | | | | | | | This reverts commit 125b1b0b9180ec8f0135da185e77250d2b8a4bea.
* | | Ensure correct ordering of results in ↵Raimonds Simanovskis2011-08-301-1/+1
| | | | | | | | | | | | | | | | | | test_update_all_with_joins_and_offset_and_order Last two asserts in this test assume that all_comments are ordered by posts.id and then by comments.id therefore additional ordering is added. Without it test was failing on Oracle which returned results in different order.
* | | 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 #2750 from rsim/fix_test_column_names_are_escaped_for_oracleJon Leighton2011-08-301-1/+7
| | | | | | | | | | | | | | | | Fix test column names are escaped for oracle
* | | | Merge pull request #2636 from dasch/document-sprockets-compressorsAaron Patterson2011-08-301-7/+23
|\ \ \ \ | | | | | | | | | | Document the Sprockets compressors
| * | | | Document the Sprockets compressorsDaniel Schierbeck2011-08-301-7/+23
|/ / / / | | | | | | | | | | | | | | | | | | | | Add documentation to Sprockets::NullCompressor and Sprockets::LazyCompressor. Also, make LazyCompressor#compressor private, as it isn't part of the public API.
* | | | 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
| | | | | | | | | | | | | | | | (and this call to super is no essential, so easiest to simply remove)
* | | | Merge pull request #2720 from biow0lf/masterXavier Noria2011-08-291-4/+4
|\ \ \ \ | | | | | | | | | | Doc fixes
| * | | | 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 Utils
| * | | | | Make #extract_schema_and_table an instance method in UtilsDaniel Schierbeck2011-07-093-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | Also, move the utils test into its own test case.
* | | | | | Move clear_timestamp_attributes into Timestamp moduleJon Leighton2011-08-292-10/+14
| | | | | |
* | | | | | The join_nodes must be passed to the JoinDependency initializer and ↵Jon Leighton2011-08-294-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | therefore counted by the alias tracker. This is because the association_joins are aliased on initialization and then the tables are cached, so it is no use to alias the join_nodes later. Fixes #2556.