diff --git a/Gemfile b/Gemfile index ec2d92c..9ecf8f3 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gem 'rails', '3.2.8' gem 'bootstrap-sass', '2.0.4' gem 'bcrypt-ruby', '3.0.1' gem 'faker', '1.0.1' -gem 'will_paginate', '3.0.3' +gem 'will_paginate', '3.0.5' gem 'bootstrap-will_paginate', '0.0.6' # Bundle edge Rails instead: diff --git a/Gemfile.lock b/Gemfile.lock index 9e4b968..02c2c64 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,6 +30,7 @@ GEM multi_json (~> 1.0) addressable (2.3.2) arel (3.0.2) + bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1-x86-mingw32) bootstrap-sass (2.0.4.0) bootstrap-will_paginate (0.0.6) @@ -73,6 +74,9 @@ GEM faker (1.0.1) i18n (~> 0.4) ffi (1.1.5) + ffi (1.1.5-x86-mingw32) + gherkin (2.11.2) + json (>= 1.4.6) gherkin (2.11.2-x86-mingw32) json (>= 1.4.6) guard (1.3.2) @@ -102,7 +106,9 @@ GEM treetop (~> 1.4.8) mime-types (1.19) multi_json (1.3.6) + nokogiri (1.5.5) nokogiri (1.5.5-x86-mingw32) + pg (0.12.2) pg (0.12.2-x86-mingw32) polyglot (0.3.3) rack (1.4.1) @@ -159,12 +165,14 @@ GEM libwebsocket (~> 0.1.3) multi_json (~> 1.0) rubyzip + spork (0.9.0) spork (0.9.0-x86-mingw32) win32-process sprockets (2.1.3) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + sqlite3 (1.3.5) sqlite3 (1.3.5-x86-mingw32) thor (0.16.0) tilt (1.3.3) @@ -175,13 +183,14 @@ GEM uglifier (1.2.3) execjs (>= 0.3.0) multi_json (>= 1.0.2) - will_paginate (3.0.3) + will_paginate (3.0.5) win32-process (0.7.0) ffi (>= 1.0.0) xpath (0.1.4) nokogiri (~> 1.3) PLATFORMS + ruby x86-mingw32 DEPENDENCIES @@ -204,4 +213,4 @@ DEPENDENCIES spork (= 0.9.0) sqlite3 (= 1.3.5) uglifier (= 1.2.3) - will_paginate (= 3.0.3) + will_paginate (= 3.0.5)