Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5

Gemfile.lock

@@ -435,7 +435,7 @@ GEM
     ruby_dep (1.5.0)
     ruby_parser (3.11.0)
       sexp_processor (~> 4.9)
-    rubyzip (1.2.1)
+    rubyzip (1.2.2)
     sass (3.5.6)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)

spec/features/home/home_spec.rb

@@ -23,7 +23,6 @@ feature "home page" do
     harvest.photos << photo
   end
 
-
   before { visit root_path }
 
   shared_examples 'shows seeds' do

spec/views/members/show.rss.haml_spec.rb

@@ -11,7 +11,6 @@ describe 'members/show.rss.haml', type: "view" do
     render
   end
 
-
   it 'shows RSS feed title' do
     is_expected.to have_text("callum's recent posts")
   end