Merge branch 'master' into newmc

Conflicts:
	app.psgi

diff --git a/app.psgi b/app.psgi
index 5d3c8987f48b80f1b2877bfdefb632b96641a6e2..fd1bcac6e68776f6b2ae82b51df654c6d42e306c 100644 (file)
--- 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 2bacc0a05a537d2d0202be8642ac824cea05970a..ef80f50eb8fa58c36d6f37691a15504ec7d380b1 100644 (file)
--- 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], []]
                },