From: Herve Saint-Amand <git@saintamh.org>
Date: Mon, 2 Jan 2017 23:48:49 +0000 (+0000)
Subject: More compact image paths
X-Git-Tag: live~3600^2~28
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/beaa85e21cc2f647d6b9b8377a3b8192b54c9201?ds=inline

More compact image paths

Make the file paths to image assets more compact. I investigated using `image_path` but could only get it to return the path for a public URL, which is different and also includes the asset pipeline digest.
---

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 40a516a92..d01ef07d1 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -170,7 +170,7 @@ class Notifier < ActionMailer::Base
                   I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter)
                 end
 
-      attachments.inline["logo.png"] = File.read(Rails.root.join("app", "assets", "images", "osm_logo_30.png"))
+      attachments.inline["logo.png"] = File.read("#{Rails.root}/app/assets/images/osm_logo_30.png")
       attachments.inline["avatar.png"] = File.read(user_avatar_file_path(comment.author))
 
       mail :to => recipient.email, :subject => subject
@@ -184,7 +184,7 @@ class Notifier < ActionMailer::Base
     if image.file?
       return image.path(:small)
     else
-      return Rails.root.join("app", "assets", "images", "users", "images", "small.png")
+      return "#{Rails.root}/app/assets/images/users/images/small.png"
     end
   end