cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix deprecation warnings

Browse source
This commit is contained in:
Tom Hughes 2020-12-29 22:36:26 +00:00
parent a71b8af4d1
commit bf851691bf
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application_controller.rb
View file

@ -208,7 +208,7 @@ class ApplicationController < ActionController::Base
report_error e.message, :bad_request report_error e.message, :bad_request
rescue ActiveRecord::RecordInvalid => e rescue ActiveRecord::RecordInvalid => e
message = "#{e.record.class} #{e.record.id}: " message = "#{e.record.class} #{e.record.id}: "
e.record.errors.each { |attr, msg| message << "#{attr}: #{msg} (#{e.record[attr].inspect})" } e.record.errors.each { |error| message << "#{error.attribute}: #{error.message} (#{e.record[error.attribute].inspect})" }
report_error message, :bad_request report_error message, :bad_request
rescue OSM::APIError => e rescue OSM::APIError => e
report_error e.message, e.status report_error e.message, e.status

2
config/environments/development.rb
View file

@ -65,7 +65,7 @@ Rails.application.configure do
config.middleware.use I18n::JS::Middleware config.middleware.use I18n::JS::Middleware
# Raises error for missing translations. # Raises error for missing translations.
# config.action_view.raise_on_missing_translations = true # config.i18n.raise_on_missing_translations = true
# Annotate rendered view with file names. # Annotate rendered view with file names.
# config.action_view.annotate_rendered_view_with_filenames = true # config.action_view.annotate_rendered_view_with_filenames = true

2
config/environments/test.rb
View file

@ -55,7 +55,7 @@ Rails.application.configure do
config.middleware.use I18n::JS::Middleware config.middleware.use I18n::JS::Middleware
# Raises error for missing translations. # Raises error for missing translations.
config.action_view.raise_on_missing_translations = true config.i18n.raise_on_missing_translations = true
# Annotate rendered view with file names. # Annotate rendered view with file names.
# config.action_view.annotate_rendered_view_with_filenames = true # config.action_view.annotate_rendered_view_with_filenames = true