diff --git a/Gemfile b/Gemfile index fca9f6c..6c94cef 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' gem "rails" gem "kaminari" gem "mysql2" -gem "devise", '2.1.2' +gem "devise", '3.5.10' gem "jquery-rails" gem "json" gem "puma" diff --git a/Gemfile.lock b/Gemfile.lock index f8ab9f6..7b28392 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,24 +30,29 @@ GEM multi_json (~> 1.0) arel (3.0.2) awesome_print (1.1.0) - bcrypt-ruby (3.0.1) + bcrypt (3.1.18) builder (3.0.4) coderay (1.0.9) - devise (2.1.2) - bcrypt-ruby (~> 3.0) + devise (3.5.10) + bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (~> 3.1) - warden (~> 1.2.1) + railties (>= 3.2.6, < 5) + responders + thread_safe (~> 0.1) + warden (~> 1.2.3) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) - hike (1.2.2) + hike (1.2.3) i18n (0.6.1) journey (1.0.4) jquery-rails (2.2.1) 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) @@ -55,9 +60,9 @@ GEM treetop (~> 1.4.8) method_source (0.8.1) mime-types (1.23) - multi_json (1.7.2) + multi_json (1.15.0) mysql2 (0.3.11) - orm_adapter (0.4.0) + orm_adapter (0.5.0) polyglot (0.3.3) pry (0.9.12.1) coderay (~> 1.0.5) @@ -77,12 +82,12 @@ GEM slop (~> 3.0) puma (2.0.1) rack (>= 1.1, < 2.0) - rack (1.4.5) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.13.0) rack (>= 0.4) - rack-ssl (1.3.3) + rack-ssl (1.3.4) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.13) actionmailer (= 3.2.13) @@ -99,17 +104,19 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.0.4) + rake (13.0.6) rdoc (3.12.2) json (~> 1.4) ref (1.0.4) + responders (1.1.2) + railties (>= 3.2, < 4.2) sass (3.2.8) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) slop (3.4.4) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -117,8 +124,9 @@ GEM therubyracer (0.11.4) libv8 (~> 3.11.8.12) ref - thor (0.18.1) - tilt (1.3.7) + thor (1.2.1) + thread_safe (0.3.6) + tilt (1.4.1) treetop (1.4.12) polyglot polyglot (>= 0.3.1) @@ -126,16 +134,17 @@ GEM uglifier (2.0.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) - warden (1.2.1) + warden (1.2.7) rack (>= 1.0) PLATFORMS ruby DEPENDENCIES - devise (= 2.1.2) + devise (= 3.5.10) jquery-rails json + kaminari mysql2 pry-meta pry-rails