Merge pull request #181 from AyuntamientoMadrid/adds-kaminari

adds kaminari to Gemfile
consuldemocracy · Aug 16, 2015 · 8c6081c · 8c6081c
2 parents 2864af0 + 055c66b
commit 8c6081c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/Gemfile b/Gemfile
@@ -21,6 +21,7 @@ gem 'turbolinks'
 gem 'devise'
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
+gem 'kaminari'
 gem 'acts_as_commentable_with_threading'
 gem 'acts-as-taggable-on'
 gem "responders"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -153,6 +153,9 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
+    kaminari (0.16.3)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
     kgio (2.9.3)
     launchy (2.4.3)
       addressable (~> 2.3)
@@ -325,6 +328,7 @@ DEPENDENCIES
   i18n-tasks
   initialjs-rails
   jquery-rails
+  kaminari
   launchy
   letter_opener_web (~> 1.2.0)
   pg