remove kaminari

2 files changed, 1 insertions, 6 deletions

diff --git a/Gemfile b/Gemfile
index b072187..d87c9f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,6 @@ gem 'em-work_queue'
 
 gem 'twitter'
 gem 'omniauth-twitter'
-gem 'kaminari'
 
 gem 'haml-rails'
 gem 'sass-rails', '~> 4.0.0.beta1'
@@ -31,7 +30,7 @@ gem 'bootstrap-sass'
 group :test do
   gem 'rspec'
   gem 'rspec-rails'
-  gem 'factory_girl_rails'#, :require => 'factory_girl'
+  gem 'factory_girl_rails'
   gem 'webmock'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 6def23d..e6d802d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -77,9 +77,6 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.7.7)
-    kaminari (0.14.1)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
     kgio (2.8.0)
     mail (2.5.3)
       i18n (>= 0.4.0)
@@ -198,7 +195,6 @@ DEPENDENCIES
   haml-rails
   jbuilder
   jquery-rails
-  kaminari
   msgpack
   mysql2 (> 0.3.12b)
   omniauth-twitter