diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim index 494bd300..68e5b868 100644 --- a/app/views/layouts/application.html.slim +++ b/app/views/layouts/application.html.slim @@ -62,8 +62,6 @@ html lang="en" .bottom p © Companytools 2012 = yield :footer - - .content - if flash[:alert].present? .alert.alert-error diff --git a/config/application.rb b/config/application.rb index a48f6249..d657f0a2 100644 --- a/config/application.rb +++ b/config/application.rb @@ -28,6 +28,9 @@ module JSON end MultiJson.engine = :json_gem +# This is a fix for testing models that +# are frozen after destroy and then extended +# by active_decorator when running the specs require 'simply_stored' module SimplyStored::Couch def freeze