diff options
| -rw-r--r-- | app/assets/images/favicon.ico (renamed from public/favicon.ico) | bin | 22382 -> 22382 bytes | |||
| -rw-r--r-- | config/deploy.rb | 1 | ||||
| -rw-r--r-- | config/initializers/alaveteli.rb | 1 | ||||
| -rw-r--r-- | doc/THEME-ASSETS-UPGRADE.md | 2 | ||||
| -rw-r--r-- | lib/actionmailer_patches.rb | 15 |
5 files changed, 2 insertions, 17 deletions
diff --git a/public/favicon.ico b/app/assets/images/favicon.ico Binary files differindex 26127495c..26127495c 100644 --- a/public/favicon.ico +++ b/app/assets/images/favicon.ico diff --git a/config/deploy.rb b/config/deploy.rb index a0189c855..3a4f175b4 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -55,7 +55,6 @@ namespace :deploy do "#{release_path}/config/aliases" => "#{shared_path}/aliases", "#{release_path}/public/foi-live-creation.png" => "#{shared_path}/foi-live-creation.png", "#{release_path}/public/foi-user-use.png" => "#{shared_path}/foi-user-use.png", - "#{release_path}/public/favicon.ico" => "#{shared_path}/favicon.ico", "#{release_path}/files" => "#{shared_path}/files", "#{release_path}/cache" => "#{shared_path}/cache", "#{release_path}/lib/acts_as_xapian/xapiandbs" => "#{shared_path}/xapiandbs", diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb index 631251b87..760c138a7 100644 --- a/config/initializers/alaveteli.rb +++ b/config/initializers/alaveteli.rb @@ -50,7 +50,6 @@ require 'normalize_string' require 'alaveteli_file_types' require 'alaveteli_localization' require 'message_prominence' -require 'actionmailer_patches' require 'theme' AlaveteliLocalization.set_locales(AlaveteliConfiguration::available_locales, diff --git a/doc/THEME-ASSETS-UPGRADE.md b/doc/THEME-ASSETS-UPGRADE.md index 2c6e49986..12c1a60d1 100644 --- a/doc/THEME-ASSETS-UPGRADE.md +++ b/doc/THEME-ASSETS-UPGRADE.md @@ -33,6 +33,8 @@ tag to use `image_tag` instead. For example, instead of: image_tag('helpmeinvestigate.png', :alt => "", :class => "rss") +If you have a favicon.ico file in your theme's `public` directory, you should move it to `assets/images` as well. + You should similarly move your stylesheets into `assets/stylesheets`. If a stylesheet refers to images, you should rename the `.css` file to `.css.scss`, and change `url` diff --git a/lib/actionmailer_patches.rb b/lib/actionmailer_patches.rb deleted file mode 100644 index 600d3c8cc..000000000 --- a/lib/actionmailer_patches.rb +++ /dev/null @@ -1,15 +0,0 @@ -# Monkey patch for CVE-2013-4389 -# derived from http://seclists.org/oss-sec/2013/q4/118 to fix -# a possible DoS vulnerability in the log subscriber component of -# Action Mailer. - -require 'action_mailer' -module ActionMailer - class LogSubscriber < ActiveSupport::LogSubscriber - def deliver(event) - recipients = Array.wrap(event.payload[:to]).join(', ') - info("\nSent mail to #{recipients} (#{event.duration.round(1)}ms)") - debug(event.payload[:mail]) - end - end -end |