github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
24,866 Commits 34 Branches 105 Tags
da516e8f544c591bbebbfd8461c60e31ecc76d22
Commit Graph

24866 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
José Valim
da516e8f54 Merge pull request #2788 from spohlenz/precompile-without-digests-master 
assets:precompile should not append asset digests when config.assets.digest is false
 2011-09-01 01:59:58 -07:00
Sam Pohlenz
58b0c97347 assets:precompile should not append asset digests when config.assets.digest is false 2011-09-01 18:01:45 +09:30
José Valim
b93c3606cb Merge pull request #2787 from guilleiguaran/changelogs-3-1-1-master 
Add missing changelog entries for 3.1.1
 2011-09-01 01:20:18 -07:00
José Valim
9af2b5eeaa Merge pull request #2786 from spohlenz/extract-asset-paths-config-master 
Remove explicit references to Rails.application.config from AssetPaths in Sprockets helper
 2011-09-01 01:15:34 -07:00
Guillermo Iguaran
5bb1c7acdc Add missing changelog entries for 3.1.1 2011-09-01 03:12:13 -05:00
Sam Pohlenz
d5165e5ab0 Move references to Rails.application.config out of Sprockets AssetPaths 2011-09-01 17:41:42 +09:30
Santiago Pastorino
3ce3b5b1f1 Merge pull request #2780 from guilleiguaran/assets-pipeline-minor-changes 
Assets pipeline: fix in manifest location and remove unused code
 2011-08-31 22:51:37 -03:00
Aaron Patterson
c5a91d0288 should be using a / in this route rather than a # 2011-08-31 16:12:26 -07:00
Xavier Noria
e851e9e407 Merge branch 'master' of git://github.com/lifo/docrails 2011-08-31 16:10:09 -07:00
Kir
6ce6ba8638 Instructions for nginx and apache added 2011-08-31 16:09:41 -07:00
Richard Hulse
f0af563952 Added new asset config options to guides 2011-09-01 11:06:05 +12:00
Greg Leppert
5767c13c68 Update wording surrounding template file extensions to include Rails 3 and above. 2011-08-31 19:39:41 -03:00
Ray Baxter
2422fbf628 make code example agree with text just above 2011-08-31 15:19:06 -07:00
Xavier Noria
27bcd96246 Merge branch 'master' of git://github.com/lifo/docrails 2011-08-31 14:30:25 -07:00
Richard Hulse
054bdc1f59 Add section to pipeline docs to help people upgrading 
These are the options from a brand new app, and
should help people get it right when upgrading.
 2011-09-01 09:11:00 +12:00
José Valim
e3efe78a5f Merge pull request #2772 from guilleiguaran/backports-assets-pipeline 
Backports of the assets pipeline changes done in 3-1-stable
 2011-08-31 11:25:47 -07:00
Andrew Olson
120b534d8e Fixing spelling, throught -> through. 2011-08-31 14:18:01 -04:00
Guillermo Iguaran
87074600d3 Fix asset debugging tests to reflect last changes in 3-1-stable 2011-08-31 13:12:25 -05:00
Guillermo Iguaran
d0b3937b8f Set default location of manifest with config.assets.manifest 2011-08-31 13:12:25 -05:00
Guillermo Iguaran
f236e00189 Backport f443f9cb0c to master 2011-08-31 13:12:09 -05:00
Guillermo Iguaran
fa04c37f45 Backport b0f3063166 to master 2011-08-31 12:42:54 -05:00
Guillermo Iguaran
dffdd82993 Read digests of assets from manifest.yml if config.assets.manifest is on 2011-08-31 12:41:28 -05:00
Chris Griego
508f33f35c Revert "Ruby 1.8.7+ provides to_date/to_datetime, AS just makes them public." to support date implementations without private to_date/to_datetime on Time (home_run). 
This reverts commit 080345baca.

Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-08-31 19:21:55 +02:00
Guillermo Iguaran
73d34feb4c Always enable digest and compile in the Rake task 2011-08-31 19:18:16 +02:00
Vijay Dev
d0fafaf20f Merge pull request #2706 from mitio/doc-changes 
Fixed some typos and made minor text changes in the Plugins guide.
 2011-08-31 07:39:48 -07:00
Rodrigo Rosenfeld Rosas
30d65da17e Fix logic in 3.1 release notes sentence 2011-08-31 10:50:08 -03:00
Xavier Noria
47b8415bef Merge branch 'master' of git://github.com/rails/rails 2011-08-31 04:27:59 -07:00
Semyon Perepelitsa
6d772c0953 Fix typo: => instead of = 2011-08-31 14:40:45 +04:00
Xavier Noria
e746c4047c syncs assets guide with what's in 3-1-stable 2011-08-31 02:04:36 -07:00
Xavier Noria
19e853275b Merge pull request #2761 from raybaxter/bump_api_url 
don't need edgeapi now that we are on 3.1
 2011-08-31 01:59:00 -07:00
Xavier Noria
d7be97ec31 release notes: adds a couple of blank lines to get the markup right 2011-08-31 01:52:43 -07:00
Xavier Noria
73263f6c81 adds the release notes of 3.1 to the index 2011-08-31 01:44:59 -07:00
Ray Baxter
331dad14bc don't need edgeapi now that we are on 3.1 2011-08-30 22:32:09 -07:00
Santiago Pastorino
f4492b8656 Bump sprockets up 2011-08-30 22:49:03 -03:00
Santiago Pastorino
e5f2b0d75f Revert "Merge pull request #2647 from dmathieu/no_rescue" 
This reverts commit 125b1b0b91.
 2011-08-30 20:52:08 -03:00
Raimonds Simanovskis
60d8e4ac28 Ensure correct ordering of results in 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.
 2011-08-30 22:33:49 +01:00
Xavier Noria
2350fecd22 adds the asset pipeline guide to the index 2011-08-30 13:48:16 -07:00
Xavier Noria
a7a01b8b8e Merge pull request #2684 from waynn/patch-2 
Rephrasing to sound more natural, and some grammar fixes.
 2011-08-30 13:32:59 -07:00
Jon Leighton
bd4bd3f50a Merge pull request #2750 from rsim/fix_test_column_names_are_escaped_for_oracle 
Fix test column names are escaped for oracle
 2011-08-30 11:04:01 -07:00
Aaron Patterson
9af7828d5a Merge pull request #2636 from dasch/document-sprockets-compressors 
Document the Sprockets compressors
 2011-08-30 10:15:54 -07:00
Daniel Schierbeck
725617a647 Document the Sprockets compressors 
Add documentation to Sprockets::NullCompressor and
Sprockets::LazyCompressor. Also, make LazyCompressor#compressor
private, as it isn't part of the public API.
 2011-08-30 11:06:53 +02:00
Xavier Noria
5aa86f793f let SDoc add a link to the source code in GitHub for each method 2011-08-29 15:47:56 -07:00
Jon Leighton
92619e4f78 Fix test failures on 1.8.7, since Object#initialize_dup is not defined there (and this call to super is no essential, so easiest to simply remove) 2011-08-29 23:05:26 +01:00
Xavier Noria
04f7338ff4 Merge pull request #2720 from biow0lf/master 
Doc fixes
 2011-08-29 14:35:08 -07:00
Aaron Patterson
cebff6d0f7 Merge pull request #2021 from dasch/more_postgres_utils 
Make #extract_schema_and_table an instance method in Utils
 2011-08-29 13:38:10 -07:00
Jon Leighton
c59c9bb8bc Move clear_timestamp_attributes into Timestamp module 2011-08-29 17:39:09 +01:00
Jon Leighton
735d985b01 The join_nodes must be passed to the JoinDependency initializer and 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. 2011-08-29 15:05:47 +01:00
Jon Leighton
fd22d040fe Move the bulk alter table code into the abstract mysql adapter, hence it is supported for mysql2 as well now. 2011-08-29 12:43:39 +01:00
Jon Leighton
4fcd847c8d Extract simplified_type into the abstract class 2011-08-29 12:43:39 +01:00
Jon Leighton
5766539342 Create an AbstractMysqlAdapter to abstract the common code between MysqlAdapter and Mysql2Adapter. 2011-08-29 12:43:39 +01:00