From: Marius Gavrilescu <marius@ieval.ro>
Date: Tue, 11 Feb 2014 07:39:04 +0000 (+0200)
Subject: Merge branch 'master' into gruntmaster
X-Git-Url: http://git.ieval.ro/?p=gruntmaster-page.git;a=commitdiff_plain;h=8b15e5c235c53e758a5f7576a987f3593efeb22a;hp=9ae94a01c8ab056521d6c3eb69fb9a6ee82a4e2f

Merge branch 'master' into gruntmaster
---

diff --git a/lib/Gruntmaster/Page/JS.pm b/lib/Gruntmaster/Page/JS.pm
index 9e78192..b8ddafb 100644
--- a/lib/Gruntmaster/Page/JS.pm
+++ b/lib/Gruntmaster/Page/JS.pm
@@ -15,7 +15,7 @@ sub generate{
 	debug $env => "";
 	my $js;
 	$js .= read_file $_ for <js/*.js>;
-	[200, ['Content-Type' => 'application/javascript', 'Cache-Control' => 'public, max-age=604800', 'X-Forever' => 1], [$js] ]
+	[200, ['Content-Type' => 'application/javascript', 'Cache-Control' => 'public, max-age=604800', 'X-Forever' => 1], [minify $js] ]
 }
 
 sub variants{ [[js => 1, 'application/javascript', undef, undef, undef, undef]] }