Merge pull request #1701 from Growstuff/dev

Release to production

CONTRIBUTORS.md

@@ -90,5 +90,5 @@ submit the change with your pull request.
 
 ### Security and Dependency Updates
 - DeppBot / [deppbot](https://github.com/deppbot)
-- dependabot[bot] / [dependabot-bot](https://github.com/dependabot-bot)
+- dependabot[bot] / [dependabot-bot] / [dependabot] (https://github.com/dependabot-bot)
 - dependabot / [dependabot](https://github.com/dependabot)

Gemfile.lock

@@ -123,7 +123,7 @@ GEM
       rails-i18n (>= 4.0.0)
       sass-rails (>= 4.0.3)
     concurrent-ruby (1.0.5)
-    connection_pool (2.2.1)
+    connection_pool (2.2.2)
     coveralls (0.8.19)
       json (>= 1.8, < 3)
       simplecov (~> 0.12.0)
@@ -311,7 +311,7 @@ GEM
     multipart-post (2.0.0)
     nenv (0.3.0)
     newrelic_rpm (5.2.0.345)
-    nokogiri (1.8.4)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -413,7 +413,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    redis (4.0.1)
+    redis (4.0.2)
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
@@ -454,7 +454,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)
@@ -474,9 +474,8 @@ GEM
       rubyzip (~> 1.2)
     sexp_processor (4.11.0)
     shellany (0.0.1)
-    sidekiq (5.1.3)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
+    sidekiq (5.2.1)
+      connection_pool (~> 2.2, >= 2.2.2)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 5)
     simplecov (0.12.0)

spec/controllers/likes_controller_spec.rb

@@ -9,9 +9,10 @@ describe LikesController do
   before { sign_in member }
 
   describe "POST create" do
-    it { expect(response.content_type).to eq "application/json" }
     before { post :create, post_id: blogpost.id, format: :json }
 
+    it { expect(response.content_type).to eq "application/json" }
+
     it { expect(Like.last.likeable_id).to eq(blogpost.id) }
     it { expect(Like.last.likeable_type).to eq('Post') }
     it { JSON.parse(response.body)["description"] == "1 like" }

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 match(/member\d+'s recent posts/)
   end