Fix rubocop warnings

This commit is contained in:
Tom Hughes 2017-06-01 23:46:53 +01:00
parent 95eda2d381
commit 5b33f3f8e3
61 changed files with 547 additions and 541 deletions

View file

@ -34,7 +34,7 @@ module OpenStreetMap
config.active_record.raise_in_transactional_callbacks = true unless STATUS == :database_offline
# Custom directories with classes and modules you want to be autoloadable.
config.autoload_paths += %W(#{config.root}/lib)
config.autoload_paths += %W[#{config.root}/lib]
# Use SQL instead of Active Record's schema dumper when creating the database.
# This is necessary if your schema can't be completely dumped by the schema dumper,

View file

@ -11,24 +11,24 @@ Rails.application.config.assets.paths << Rails.root.join("config")
# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
Rails.application.config.assets.precompile += %w(index.js browse.js welcome.js fixthemap.js)
Rails.application.config.assets.precompile += %w(user.js login.js diary_entry.js edit/*.js)
Rails.application.config.assets.precompile += %w(screen-ltr.css print-ltr.css)
Rails.application.config.assets.precompile += %w(screen-rtl.css print-rtl.css)
Rails.application.config.assets.precompile += %w(leaflet-all.css leaflet.ie.css)
Rails.application.config.assets.precompile += %w(id.js id.css)
Rails.application.config.assets.precompile += %w(embed.js embed.css)
Rails.application.config.assets.precompile += %w(html5shiv.js)
Rails.application.config.assets.precompile += %w(images/marker-*.png img/*-handle.png)
Rails.application.config.assets.precompile += %w(swfobject.js expressInstall.swf)
Rails.application.config.assets.precompile += %w(potlatch2.swf)
Rails.application.config.assets.precompile += %w(potlatch2/assets.zip)
Rails.application.config.assets.precompile += %w(potlatch2/FontLibrary.swf)
Rails.application.config.assets.precompile += %w(potlatch2/locales/*.swf)
Rails.application.config.assets.precompile += %w(help/introduction.*)
Rails.application.config.assets.precompile += %w(iD/img/*.svg iD/img/*.png iD/img/*.gif)
Rails.application.config.assets.precompile += %w(iD/img/pattern/*.png)
Rails.application.config.assets.precompile += %w(iD/locales/*.json)
Rails.application.config.assets.precompile += %w(iD/traffico/stylesheets/traffico.css)
Rails.application.config.assets.precompile += %w(iD/traffico/fonts/traffico_*)
Rails.application.config.assets.precompile += %w(iD/traffico/string-maps/*.json)
Rails.application.config.assets.precompile += %w[index.js browse.js welcome.js fixthemap.js]
Rails.application.config.assets.precompile += %w[user.js login.js diary_entry.js edit/*.js]
Rails.application.config.assets.precompile += %w[screen-ltr.css print-ltr.css]
Rails.application.config.assets.precompile += %w[screen-rtl.css print-rtl.css]
Rails.application.config.assets.precompile += %w[leaflet-all.css leaflet.ie.css]
Rails.application.config.assets.precompile += %w[id.js id.css]
Rails.application.config.assets.precompile += %w[embed.js embed.css]
Rails.application.config.assets.precompile += %w[html5shiv.js]
Rails.application.config.assets.precompile += %w[images/marker-*.png img/*-handle.png]
Rails.application.config.assets.precompile += %w[swfobject.js expressInstall.swf]
Rails.application.config.assets.precompile += %w[potlatch2.swf]
Rails.application.config.assets.precompile += %w[potlatch2/assets.zip]
Rails.application.config.assets.precompile += %w[potlatch2/FontLibrary.swf]
Rails.application.config.assets.precompile += %w[potlatch2/locales/*.swf]
Rails.application.config.assets.precompile += %w[help/introduction.*]
Rails.application.config.assets.precompile += %w[iD/img/*.svg iD/img/*.png iD/img/*.gif]
Rails.application.config.assets.precompile += %w[iD/img/pattern/*.png]
Rails.application.config.assets.precompile += %w[iD/locales/*.json]
Rails.application.config.assets.precompile += %w[iD/traffico/stylesheets/traffico.css]
Rails.application.config.assets.precompile += %w[iD/traffico/fonts/traffico_*]
Rails.application.config.assets.precompile += %w[iD/traffico/string-maps/*.json]

View file

@ -1,5 +1,5 @@
Sanitize::Config::OSM = Sanitize::Config::RELAXED.dup
Sanitize::Config::OSM[:elements] -= %w(div style)
Sanitize::Config::OSM[:elements] -= %w[div style]
Sanitize::Config::OSM[:add_attributes] = { "a" => { "rel" => "nofollow" } }
Sanitize::Config::OSM[:remove_contents] = %w(script style)
Sanitize::Config::OSM[:remove_contents] = %w[script style]

View file

@ -1,17 +1,17 @@
if defined?(CSP_REPORT_URL)
policy = {
:default_src => %w('self'),
:child_src => %w('self'),
:connect_src => %w('self'),
:font_src => %w('none'),
:form_action => %w('self'),
:frame_ancestors => %w('self'),
:img_src => %w('self' data: www.gravatar.com *.wp.com *.tile.openstreetmap.org *.tile.thunderforest.com *.openstreetmap.fr),
:media_src => %w('none'),
:object_src => %w('self'),
:plugin_types => %w('none'),
:script_src => %w('self'),
:style_src => %w('self' 'unsafe-inline'),
:default_src => %w['self'],
:child_src => %w['self'],
:connect_src => %w['self'],
:font_src => %w['none'],
:form_action => %w['self'],
:frame_ancestors => %w['self'],
:img_src => %w['self' data: www.gravatar.com *.wp.com *.tile.openstreetmap.org *.tile.thunderforest.com *.openstreetmap.fr],
:media_src => %w['none'],
:object_src => %w['self'],
:plugin_types => %w['none'],
:script_src => %w['self'],
:style_src => %w['self' 'unsafe-inline'],
:report_uri => [CSP_REPORT_URL]
}