Commit Graph

7460 Commits

Author SHA1 Message Date
Alexey Vakhov
fddf7ea1c1 current_page? returns false for non-GET requests 2011-09-02 18:20:10 +04:00
Aaron Patterson
fdd619e9a7 CookieJar is enumerable. fixes #2795 2011-09-01 13:37:14 -07:00
Vijay Dev
7a7a3bcf02 Merge pull request #2718 from dasch/patch-5
Split long string into multiple shorter ones
2011-09-01 10:45:34 -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
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
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
dffdd82993 Read digests of assets from manifest.yml if config.assets.manifest is on 2011-08-31 12:41:28 -05:00
Guillermo Iguaran
73d34feb4c Always enable digest and compile in the Rake task 2011-08-31 19:18:16 +02: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
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
Daniel Schierbeck
a720243961 Split long string into multiple shorter ones
This makes the code more readable.
2011-08-29 04:15:15 +03:00
Guillermo Iguaran
381904d26b Avoid extra recursive call in Sprockets helpers 2011-08-28 19:00:58 -05:00
Santiago Pastorino
734792aaaa Merge pull request #2723 from guilleiguaran/3-1-0-changelogs
Update changelogs for Rails 3.1.0
2011-08-28 20:42:12 -03:00
Santiago Pastorino
49af31eada Bump rack-cache, rack-test, rack-mount and sprockets up 2011-08-28 19:06:29 -03:00
Daniel Schierbeck
62a61add7e Refactor ActionDispatch::Http::UploadedFile 2011-08-28 16:16:22 +02:00
Xavier Noria
bb4dedbc2c deletes spurious arrow 2011-08-27 15:34:33 -07:00
Vijay Dev
8526f727cf doc fixes 2011-08-28 02:27:39 +05:30
Arun Agrawal
651ef614f1 Removed Unused Variable. 2011-08-26 11:29:05 +05:30
Santiago Pastorino
bad6803570 Merge pull request #2696 from guilleiguaran/string-keys-sprockets-helpers
Removing redundant stringify_keys in Sprockets helpers
2011-08-25 14:18:16 -07:00
Guillermo Iguaran
f5472a3898 Removing redundant stringify_keys in Sprockets helpers 2011-08-25 16:09:53 -05:00
Daniel Schierbeck
8724f00cbd Don't require a specific value for the ?debug flag
Previously, only "1" and "true" were accepted. This change makes
any value, or no value at all, have the same effect.
2011-08-25 20:39:18 +02:00
Aaron Patterson
df948f3100 Merge pull request #2690 from dasch/pretty-debug-assets
Make Sprockets::Helpers::RailsHelper#debug_assets? more readable
2011-08-25 11:05:57 -07:00
Santiago Pastorino
eb6906890e Tiny refactor 2011-08-25 11:40:59 -03:00
Santiago Pastorino
67274ca162 Merge pull request #2491 from waynn/fix_symbol
fix destructive stringify_keys for label_tag
2011-08-25 07:39:31 -07:00
Daniel Schierbeck
b59aa358bb Make Sprockets::Helpers::RailsHelper#debug_assets? more readable 2011-08-25 12:36:11 +02:00
Aaron Patterson
b907271b4b stop circular require warnings 2011-08-24 16:47:01 -07:00
Guillermo Iguaran
23b5c55221 Preserve stylesheet_link_tag and javascript_include_tag options on debug 2011-08-24 16:01:06 -05:00
Guillermo Iguaran
e0db9cb17d Use super in javascript_include_tag and stylesheet_link_tag instead of generate tags manually 2011-08-24 15:54:47 -05:00
Guillermo Iguaran
c5a52850b3 Remove redundant join and call to html_safe 2011-08-24 15:40:10 -05:00
Santiago Pastorino
289540e4ff Revert "Simplify JavaScriptHelper#escape_javascript"
This commit broke the build without any improvement.

This reverts commit eb0b71478a.
2011-08-24 13:22:37 -03:00
Joshua Peek
5493d22419 Bring in sprockets precompile task 2011-08-24 10:58:43 -05:00
Santiago Pastorino
976b2be108 Merge pull request #2644 from guilleiguaran/allow-assets-debugging
Add config.allow_debugging option
2011-08-24 08:01:08 -07:00
Guillermo Iguaran
827cdae6fb Add config.allow_debugging option to determine if the debug_assets query param can be passed by user 2011-08-24 09:53:55 -05:00
Santiago Pastorino
23d8a980d2 Merge pull request #2668 from guilleiguaran/debug-assets-media-type
Debug assets shouldn't ignore media type for stylesheets. Closes #2625
2011-08-24 07:46:04 -07:00
Santiago Pastorino
f162f84aa5 Merge pull request #2647 from dmathieu/no_rescue
remove useless rescue
2011-08-24 07:02:03 -07:00
Daniel Schierbeck
eb0b71478a Simplify JavaScriptHelper#escape_javascript
Use the Linus-style conditional. Also fix the documentation slightly.

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
2011-08-24 11:36:45 +01:00
Damien Mathieu
13dd7758ce remove useless rescue
params is a method, defined in every controller, which always returns a hash.
If it raises a NoMethodError, it means there's a bug somewhere else, which we want to know about.
2011-08-24 09:52:00 +02:00
Guillermo Iguaran
d133fd6d29 Debug assets shouldn't ignore media type for stylesheets. Closes #2625 2011-08-23 21:36:21 -05:00
David Majda
68a13eded3 Make ActionController::TestCase#recycle! set @protocol to nil
This ensures that the protocol does not get carried over when there are
two or more requests in functional tests. This was a problem when e.g.
the first request was HTTP and the second request was HTTPS.

Closes #2654.

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
2011-08-23 15:34:11 +01:00
Andrew White
ebea387e4b Add failing test case for #2654 2011-08-23 15:33:59 +01:00
Andrew White
13400ac289 Ensure regexp and hash key are UTF-8 2011-08-23 14:56:04 +01:00
Andrew White
14cf4b2e35 Don't modify params in place - fixes #2624 2011-08-23 11:07:37 +01:00
Santiago Pastorino
0b6da0c654 Merge pull request #2411 from ai/debug_assets_by_config
Debug assets by config
2011-08-22 11:50:27 -07:00
Guillermo Iguaran
e1f11ff37f Fix Sprockets rewrite_asset_path 2011-08-22 11:12:54 -05:00
Daniel Schierbeck
db181bddb6 Refactor Sprockets::Helpers::RailsHelper#performing_caching?
No need for them lines to get so long! Also, move that comment into
the method body where it belongs!
2011-08-22 16:50:33 +02:00