From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 21 Jul 2017 12:22:05 +0000 (+0900)
Subject: Run `bundle` (regression from #4284) (#4290)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=d4c6bf770d19d4fd9b1c05791679aa4e1ca15ea7;p=mastodon.git

Run `bundle` (regression from #4284) (#4290)
---

diff --git a/Gemfile.lock b/Gemfile.lock
index 8ed079753..e5fd3506a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -163,7 +163,6 @@ GEM
     fuubar (2.2.0)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    gemoji (3.0.0)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
     goldfinger (2.0.0)
@@ -523,7 +522,6 @@ DEPENDENCIES
   faker (~> 1.7)
   fast_blank (~> 1.0)
   fuubar (~> 2.2)
-  gemoji (~> 3.0)
   goldfinger (~> 2.0)
   hamlit-rails (~> 0.2)
   hiredis (~> 0.6)