Merge branch 'master' into newmc

Conflicts:
	app.psgi

diff --combined app.psgi
index 5d3c8987f48b80f1b2877bfdefb632b96641a6e2,dc9f75b333b5112b99bca0cb0f8a486b9d55069e..fd1bcac6e68776f6b2ae82b51df654c6d42e306c
--- 1/app.psgi
--- 2/app.psgi
+++ b/app.psgi
@@@ -12,8 -12,8 +12,8 @@@ 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'; style-src 'self'; img-src 'self'; connect-src 'self',;
 +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 --combined lib/Plack/App/Gruntmaster.pm
index 2bacc0a05a537d2d0202be8642ac824cea05970a,40879a98e9ac87f26d381063bb64fddd059159c7..ef80f50eb8fa58c36d6f37691a15504ec7d380b1
--- 1/lib/Plack/App/Gruntmaster.pm
--- 2/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@@ -166,8 -166,7 +166,8 @@@ sub dispatch_request
  
                sub (/ed/:contest) {
                        forbid contest->is_running;
 -                      response ed => 'Editorial of ' . contest->name, db->problem_list(contest => $_{contest}, solution => 1);
 +                      my $pblist = db->problem_list(contest => $_{contest}, solution => 1);
 +                      response ed => 'Editorial of ' . contest->name, {%$pblist, editorial => contest->editorial};
                },
  
                sub (/login) {
@@@ -227,7 -226,6 +227,6 @@@
                        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 -262,6 +263,6 @@@
                                owner => remote_user->id,
                        });
  
-                       purge '/log/';
                        [303, [Location => '/log/' . $newjob->id], []]
                },