From 21476e4ea78bb28d5dec4ac964267a5db10ceae8 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Mon, 20 Jun 2016 22:57:02 +0200
Subject: [PATCH] Bump eslintrb

---
 Gemfile      |  3 ---
 Gemfile.lock | 15 ++++-----------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index e3da82bc0..722ebf866 100644
--- a/Gemfile
+++ b/Gemfile
@@ -250,9 +250,6 @@ group :development do
   gem "pronto-haml",    "0.6.0"
   gem "pronto-scss",    "0.6.0", require: false
 
-  # We need to use a fork of eslintrb until https://github.com/zendesk/eslintrb/pull/7 is merged
-  gem "eslintrb",       github: "denschub/eslintrb", ref: "8e6eec682909ae5dabb2609b3ac6331f128cf539"
-
   # Preloading environment
 
   gem "spring", "1.7.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index 3f6e014e4..0c21c20f0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,3 @@
-GIT
-  remote: git://github.com/denschub/eslintrb.git
-  revision: 8e6eec682909ae5dabb2609b3ac6331f128cf539
-  ref: 8e6eec682909ae5dabb2609b3ac6331f128cf539
-  specs:
-    eslintrb (2.0.4)
-      execjs
-      multi_json (>= 1.3)
-      rake
-
 GEM
   remote: https://rubygems.org/
   remote: https://rails-assets.org/
@@ -208,6 +198,10 @@ GEM
       railties (>= 4.1, <= 5)
     equalizer (0.0.10)
     erubis (2.7.0)
+    eslintrb (2.1.0)
+      execjs
+      multi_json (>= 1.3)
+      rake
     ethon (0.9.0)
       ffi (>= 1.3.0)
     excon (0.49.0)
@@ -936,7 +930,6 @@ DEPENDENCIES
   diaspora_federation-rails (= 0.0.13)
   diaspora_federation-test (= 0.0.13)
   entypo-rails (= 3.0.0.pre.rc2)
-  eslintrb!
   eye (= 0.8.1)
   factory_girl_rails (= 4.7.0)
   faraday (= 0.9.2)