From 1d68fe1a60088183e6907a93dc5148b7dd11cdec Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 7 Jun 2017 22:57:59 +0900
Subject: [PATCH] Fix Code Climate failed (regression from #3622) (#3624)

---
 app/services/process_feed_service.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 924a78b65f..eabeb1799a 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -63,11 +63,7 @@ class ProcessFeedService < BaseService
         return status unless just_created
 
         if verb == :share
-          if original_status.reblog?
-            status.reblog = original_status.reblog
-          else
-            status.reblog = original_status
-          end
+          status.reblog = original_status.reblog? ? original_status.reblog : original_status
         end
 
         status.thread = find_status(thread(@xml).first) if thread?(@xml)
-- 
GitLab