From 08d407f041132516e0de506712c89833a2d44f81 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 22 Jan 2017 20:33:37 +1300
Subject: [PATCH 1/2] Fix display of gardens on smaller screens

---
 app/assets/stylesheets/overrides.sass | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/assets/stylesheets/overrides.sass b/app/assets/stylesheets/overrides.sass
index 3261470ca..155e36155 100644
--- a/app/assets/stylesheets/overrides.sass
+++ b/app/assets/stylesheets/overrides.sass
@@ -319,9 +319,6 @@ $state-success-bg: lighten($green, 50%)
     text-overflow: ellipsis
     overflow: hidden
 
-#gardens_panel_body
-  height: 20em
-
 .form-group.required .control-label:before
   content: "* "
   color: red

From 370938c9f990d3440480ed05e90a5bf1e5d2df08 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 22 Jan 2017 21:22:30 +1300
Subject: [PATCH 2/2] change deliver_later to deliver_now, so we don't
 sys.exit() crash

---
 app/controllers/crops_controller.rb | 6 +++---
 app/models/notification.rb          | 2 +-
 lib/tasks/growstuff.rake            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/crops_controller.rb b/app/controllers/crops_controller.rb
index 00e9ab1ca..a61e3c202 100644
--- a/app/controllers/crops_controller.rb
+++ b/app/controllers/crops_controller.rb
@@ -138,7 +138,7 @@ class CropsController < ApplicationController
         end
         unless current_member.role? :crop_wrangler
           Role.crop_wranglers.each do |w|
-            Notifier.new_crop_request(w, @crop).deliver_later!
+            Notifier.new_crop_request(w, @crop).deliver_now!
           end
         end
 
@@ -166,8 +166,8 @@ class CropsController < ApplicationController
         if previous_status == "pending"
           requester = @crop.requester
           new_status = @crop.approval_status
-          Notifier.crop_request_approved(requester, @crop).deliver_later! if new_status == "approved"
-          Notifier.crop_request_rejected(requester, @crop).deliver_later! if new_status == "rejected"
+          Notifier.crop_request_approved(requester, @crop).deliver_now! if new_status == "approved"
+          Notifier.crop_request_rejected(requester, @crop).deliver_now! if new_status == "rejected"
         end
         format.html { redirect_to @crop, notice: 'Crop was successfully updated.' }
         format.json { head :no_content }
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 4929a3bbc..a7320692e 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -21,6 +21,6 @@ class Notification < ActiveRecord::Base
   end
 
   def send_email
-    Notifier.notify(self).deliver_later if recipient.send_notification_email
+    Notifier.notify(self).deliver_now! if recipient.send_notification_email
   end
 end
diff --git a/lib/tasks/growstuff.rake b/lib/tasks/growstuff.rake
index de4c34bc5..15e15fef5 100644
--- a/lib/tasks/growstuff.rake
+++ b/lib/tasks/growstuff.rake
@@ -53,7 +53,7 @@ namespace :growstuff do
 
     if Date.today.cwday == send_on_day and Date.today.cweek % every_n_weeks == 0
       Member.confirmed.find_each do |m|
-        Notifier.planting_reminder(m).deliver_later!
+        Notifier.planting_reminder(m).deliver_now!
       end
     end
   end