diff options
| author | azul <azul@riseup.net> | 2017-03-23 09:03:25 +0000 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2017-03-23 09:03:25 +0000 |
| commit | 96c3123b9a30df3d7750b1f8e4bda2aba3d1fcb7 (patch) | |
| tree | f16e3d9f830cef89d523ef2da66fd27bb2afd426 /app/controllers/application_controller.rb | |
| parent | 3efe125d6e3bd5f4eecd18952376ffc37e09b9c5 (diff) | |
| parent | 1e672227a23afbb9f319a0aefa0b0ca3495fa1c6 (diff) | |
Merge branch 'bugfix/handle-couch-conflicts' into 'master'
bugfix: handle couch 404s
See merge request !26
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8d08a2c..1f37fea 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -10,9 +10,6 @@ class ApplicationController < ActionController::Base # rendered and that template is not present before_filter :verify_request_format!, if: :mime_types_specified - rescue_from StandardError, :with => :default_error_handler - rescue_from CouchRest::Exception, :with => :default_error_handler - ActiveSupport.run_load_hooks(:application_controller, self) protected @@ -22,13 +19,6 @@ class ApplicationController < ActionController::Base mimes.present? end - def default_error_handler(exc) - respond_to do |format| - format.json { render_json_error(exc) } - format.all { raise exc } # reraise the exception so the normal thing happens. - end - end - # # I think this should be 'errors', not 'error', since that is what # `respond_with @object` will return. For now, I am leaving this as 'error', |