X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5531c0bf344e74075a0877df38aeab3ef83a54bb..0531a7dfa1eaaff427ec98c23672f4358dbf94fd:/app/controllers/user_controller.rb diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 52c3deac8..3d2012064 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -1,6 +1,5 @@ class UserController < ApplicationController - layout 'site', :except => [:api_details, :login] - layout 'slim', :only => :login + layout 'site', :except => [:api_details] before_filter :authorize, :only => [:api_details, :api_gpx_files] before_filter :authorize_web, :except => [:api_details, :api_gpx_files] @@ -258,6 +257,7 @@ class UserController < ApplicationController elsif flash[:notice].nil? flash.now[:notice] = t 'user.login.notice' end + render :layout => 'slim' end def logout