From: Marius Gavrilescu <marius@ieval.ro>
Date: Tue, 24 Feb 2015 19:51:29 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=b7c79e04cb3c8ea826ea1aac8049333564794536;hp=9b61d5e9aff899014d7aca0feb9bab07cbcb8aef;p=plack-app-gruntmaster.git

Merge branch 'master' into newmc

Conflicts:
	app.psgi
---

diff --git a/app.psgi b/app.psgi
index 5d3c898..fd1bcac 100644
--- a/app.psgi
+++ b/app.psgi
@@ -12,7 +12,7 @@ use Log::Log4perl;
 use Tie::Hash::Expire;
 
 use constant AUTH_TIMEOUT => 5 * 60;
-use constant ACCESSLOG_FORMAT => '%{X-Forwarded-For}i|%h %u "%r" %>s %b "%{Referer}i" "%{User-agent}i"';
+use constant ACCESSLOG_FORMAT => 'combined';
 use constant CONTENT_SECURITY_POLICY => q,default-src 'none'; script-src 'self' static.mindcoding.ro www.google-analytics.com; style-src 'self' static.mindcoding.ro; img-src 'self' static.mindcoding.ro www.google-analytics.com; connect-src 'self',;
 
 our $db //= Gruntmaster::Data->connect($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 2bacc0a..ef80f50 100644
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -227,7 +227,6 @@ sub dispatch_request{
 			db->users->create({id => $_{username}, name => $_{name}, email => $_{email}, phone => $_{phone}, town => $_{town}, university => $_{university}, country => $_{country}, level => $_{level}});
 			db->user($_{username})->set_passphrase($_{password});
 
-			purge '/us/';
 			reply 'Registered successfully';
 		},
 
@@ -264,7 +263,6 @@ sub dispatch_request{
 				owner => remote_user->id,
 			});
 
-			purge '/log/';
 			[303, [Location => '/log/' . $newjob->id], []]
 		},