Rebases against master

rubyforgood · Mar 13, 2019 · 42a03e5 · 42a03e5
1 parent a5d2d85
commit 42a03e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -234,7 +234,7 @@ GEM
     mimemagic (0.3.2)
     mini_magick (4.9.2)
     mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
     momentjs-rails (2.20.1)
       railties (>= 3.1)
@@ -245,8 +245,8 @@ GEM
     net-ssh (5.0.2)
     newrelic_rpm (5.6.0.349)
     nio4r (2.3.1)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)

diff --git a/db/schema.rb b/db/schema.rb
@@ -222,7 +222,6 @@
     t.string "zipcode"
     t.float "latitude"
     t.float "longitude"
-    t.text "default_email_text"
     t.index ["latitude", "longitude"], name: "index_organizations_on_latitude_and_longitude"
     t.index ["short_name"], name: "index_organizations_on_short_name"
   end