From 3eae5dff1f8e5abf86df05b04fe1f3fcc10c3a2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Wed, 2 Sep 2015 19:21:15 +0200
Subject: [PATCH] adds ancestry

---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 70a599bf6..a986bf6e2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,7 @@ gem 'omniauth-facebook'
 gem 'omniauth-google-oauth2'
 
 gem 'kaminari'
-gem 'acts_as_commentable_with_threading'
+gem 'ancestry'
 gem 'acts-as-taggable-on'
 gem "responders"
 gem 'foundation-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index ca0eb3d31..26b825c0d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,10 +38,6 @@ GEM
       tzinfo (~> 1.1)
     acts-as-taggable-on (3.5.0)
       activerecord (>= 3.2, < 5)
-    acts_as_commentable_with_threading (2.0.0)
-      activerecord (>= 4.0)
-      activesupport (>= 4.0)
-      awesome_nested_set (>= 3.0)
     acts_as_votable (0.10.0)
     addressable (2.3.8)
     ahoy_matey (1.2.1)
@@ -57,9 +53,9 @@ GEM
     akami (1.3.1)
       gyoku (>= 0.4.0)
       nokogiri
+    ancestry (2.1.0)
+      activerecord (>= 3.0.0)
     arel (6.0.3)
-    awesome_nested_set (3.0.2)
-      activerecord (>= 4.0.0, < 5)
     bcrypt (3.1.10)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
@@ -392,9 +388,9 @@ PLATFORMS
 
 DEPENDENCIES
   acts-as-taggable-on
-  acts_as_commentable_with_threading
   acts_as_votable
   ahoy_matey (~> 1.2.1)
+  ancestry
   bullet
   byebug
   cancancan