diff --git a/Gemfile.lock b/Gemfile.lock index f8ab9f6..f20f143 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,7 +32,7 @@ GEM awesome_print (1.1.0) bcrypt-ruby (3.0.1) builder (3.0.4) - coderay (1.0.9) + coderay (1.1.3) devise (2.1.2) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) @@ -48,31 +48,33 @@ GEM railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.7.7) + kaminari (0.17.0) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) libv8 (3.11.8.17) mail (2.5.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - method_source (0.8.1) + method_source (1.0.0) mime-types (1.23) - multi_json (1.7.2) + multi_json (1.15.0) mysql2 (0.3.11) orm_adapter (0.4.0) polyglot (0.3.3) - pry (0.9.12.1) - coderay (~> 1.0.5) - method_source (~> 0.8) - slop (~> 3.4) + pry (0.14.1) + coderay (~> 1.1) + method_source (~> 1.0) pry-meta (0.0.5) awesome_print pry pry-nav pry-remote - pry-nav (0.2.3) - pry (~> 0.9.10) - pry-rails (0.2.2) - pry (>= 0.9.10) - pry-remote (0.1.7) + pry-nav (1.0.0) + pry (>= 0.9.10, < 0.15) + pry-rails (0.3.9) + pry (>= 0.10.4) + pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) puma (2.0.1) @@ -108,7 +110,7 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - slop (3.4.4) + slop (3.6.0) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) @@ -136,6 +138,7 @@ DEPENDENCIES devise (= 2.1.2) jquery-rails json + kaminari mysql2 pry-meta pry-rails