Merge f11f1fc44a into 609f2fd564

2014-07-18 08:22:35 +00:00 · 2014-07-18 08:22:35 +00:00 · ddeae89d0f
commit ddeae89d0f
parent 609f2fd564 f11f1fc44a
10 changed files with 182 additions and 43 deletions
--- a/app/models/email_settings.rb
+++ b/app/models/email_settings.rb
@ -49,6 +49,8 @@ class EmailSettings < ActiveRecord::Base
    parse_template(template, values)
  end

+  private
+
  def parse_template(text, values)
    values.each do |key, value|
      text = text.gsub "{#{key}}", value unless text.blank?