From 351074d05c447154fc5924d08627cc92d97e6857 Mon Sep 17 00:00:00 2001 From: Godwin Date: Mon, 24 Jul 2017 11:01:41 -0700 Subject: [PATCH 1/3] Added map JSON data to asset precompilation (#243) * Fixed fonts * Fixed assets * Fixed logo in emails * Switched to immediate email delivery * Fixed prod emails and added deployment tasks * Fixed deployments * Updated README * Added Bike Collectives Core to README * Fixed issue with map loading * Fixed issue with map loading * Added map JSON data to assets precompilation --- config/initializers/assets.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 771c4c2..37695d2 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -8,4 +8,4 @@ Rails.application.config.assets.version = '1.0' # 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( quill.js quill.css topojson.js pen.js *.js user-mailer.css favicon.ico fonts/*) +Rails.application.config.assets.precompile += %w( quill.js quill.css topojson.js pen.js *.js user-mailer.css favicon.ico world-110m.json fonts/*) From 6a3cf568aa005dad2f1e0fa4555aefaaea2363f5 Mon Sep 17 00:00:00 2001 From: Godwin Date: Mon, 24 Jul 2017 12:51:08 -0700 Subject: [PATCH 2/3] Fixed contact form (#244) * Fixed fonts * Fixed assets * Fixed logo in emails * Switched to immediate email delivery * Fixed prod emails and added deployment tasks * Fixed deployments * Updated README * Added Bike Collectives Core to README * Fixed issue with map loading * Fixed issue with map loading * Added map JSON data to assets precompilation * Fixed error sending to conference administrators --- app/controllers/application_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8b67799..f352be1 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -217,8 +217,8 @@ class ApplicationController < BaseController if params[:reason] == 'conference' && logged_in? - @conference.conference_administrators.each do |user| - email_list << user.named_email + @conference.conference_administrators.each do |administrator| + email_list << administrator.user.named_email end end From c0346525d6329af97f48bb8ab20b579815ebf711 Mon Sep 17 00:00:00 2001 From: Godwin Date: Tue, 25 Jul 2017 10:15:12 -0700 Subject: [PATCH 3/3] Development (#245) * Fixed fonts * Fixed assets * Fixed logo in emails * Switched to immediate email delivery * Fixed prod emails and added deployment tasks * Fixed deployments * Updated README * Added Bike Collectives Core to README * Fixed issue with map loading * Fixed issue with map loading * Added map JSON data to assets precompilation * Fixed error sending to conference administrators * Let error report signature wrap --- app/views/user_mailer/error_report.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/user_mailer/error_report.html.haml b/app/views/user_mailer/error_report.html.haml index 7227268..52b82fe 100644 --- a/app/views/user_mailer/error_report.html.haml +++ b/app/views/user_mailer/error_report.html.haml @@ -2,7 +2,7 @@ %h2 Error details %code.signature{class: "#{@report.source}-signature"} - = "#{@report.signature}" + = "#{@report.signature.gsub(/\n\s+/, '
 nbsp;')}".html_safe %code.backtrace{class: "#{@report.source}-backtrace"}=@report.backtrace %h2 Request details