From 1db3dcfb2031a70598379a2b056916ac95a80821 Mon Sep 17 00:00:00 2001 From: jomo Date: Mon, 22 Sep 2014 05:08:00 +0200 Subject: [PATCH] use fixed kaminari (temporary, probably) --- Gemfile | 2 +- Gemfile.lock | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index be45cb0..cc45f66 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem 'rb-readline' gem 'rest-client' gem 'activerecord-session_store' gem 'highlight_js-rails' -gem 'kaminari' # pagination +gem 'kaminari', github: 'jomo/kaminari', branch: 'patch-2' # pagination # Gems used only for assets and not required # in production environments by default. diff --git a/Gemfile.lock b/Gemfile.lock index c3aa604..ecad53f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,12 @@ +GIT + remote: git://github.com/jomo/kaminari.git + revision: e49066e94d77a6abb03a0819f3c4b0cc6923cb70 + branch: patch-2 + specs: + kaminari (1.0.0.alpha) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) + GEM remote: https://rubygems.org/ specs: @@ -69,9 +78,6 @@ GEM railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) - kaminari (0.16.1) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) kgio (2.9.2) libv8 (3.16.14.3) mail (2.5.4) @@ -173,7 +179,7 @@ DEPENDENCIES highlight_js-rails hirb jquery-rails - kaminari + kaminari! mysql2 rails (= 4.1.0) rails-erd