Merge branch 'master' of github.com:fetsite/fetsite

Conflicts: app/controllers/application_controller.rb
2014-11-10 20:23:47 +01:00
parent 24c76a7f5d 9f61769425
commit 02eba03439
2 changed files with 8 additions and 1 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -22,6 +22,7 @@
      stored_location_for(resource) || root_path
    end
  end
+
  rescue_from CanCan::AccessDenied do |exception|
    
    if user_signed_in?
@@ -37,6 +38,7 @@
    
  end 
  
+
 def get_theme
  if ThemesForRails.available_theme_names.include?(params[:theme])
  params[:theme]