diff --git a/app/controllers/concerns/errors.rb b/app/controllers/concerns/errors.rb index 075d5bbc28..c860fef302 100644 --- a/app/controllers/concerns/errors.rb +++ b/app/controllers/concerns/errors.rb @@ -3,7 +3,6 @@ module Errors extend ActiveSupport::Concern included do - rescue_from Exception, with: -> { render_error(code: 500) } rescue_from ActiveRecord::RecordInvalid, with: -> { render_error(code: 422) } rescue_from ActiveRecord::RecordNotFound, with: -> { render_error(code: 404) } rescue_from ActionController::UnknownController, with: -> { render_error(code: 404) } diff --git a/app/views/errors/500.html.slim b/app/views/errors/500.html.slim deleted file mode 100644 index 79cf1ecfa7..0000000000 --- a/app/views/errors/500.html.slim +++ /dev/null @@ -1,19 +0,0 @@ -- @title = "We're sorry, but something went wrong (500)" - -= render 'errors/analytics_javascript', locals: { code: 500, message: 'server error'} - -.container - .col-xs-12 - .error-page.text-center - h1 - | So sorry to interrupt your shopping experience. - p - | In the meantime, here is a $20 voucher to make up for your time - just use this code @checkout: OOPS20

- p - | We should be back up in a few minutes but if you would like some further assistance, feel free to email or call us: - p - = link_to 'team@fameandpartners.com', 'mailto:team@fameandpartners.com' - p - | Our site engineers are currently making some upgrades to make it even better. - p.thin-line--bottom.thin-line--alignCenter - = link_to 'Go to homepage', root_path diff --git a/public/500.html b/public/500.html new file mode 100644 index 0000000000..9b0f5aea3d --- /dev/null +++ b/public/500.html @@ -0,0 +1,64 @@ + + + + We're sorry, but something went wrong (500) + + + + + +
+ +

So sorry to interrupt your shopping experience.

+

In the meantime, here is a $20 voucher to make up for your time - just use this code @checkout: OOPS20

+

+ We should be back up in a few minutes but if you would like some further assistance, feel free to email or call us: +

+

+ team@fameandpartners.com +

+
+ Our site engineers are currently making some upgrades to make it even better. +
+

+ Go to the homepage +

+
+
+ ::CLOUDFLARE_ERROR_500S_BOX:: +
+ + +