diff --git a/Gemfile.lock b/Gemfile.lock index 109b7ed..03f3a95 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,6 +29,7 @@ GEM i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.2) + bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1-x86-mingw32) builder (3.0.0) cancan (1.6.8) @@ -39,6 +40,7 @@ GEM coffee-script-source execjs coffee-script-source (1.3.3) + concurrent-ruby (1.1.10) devise (2.1.2) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) @@ -48,7 +50,8 @@ GEM execjs (1.4.0) multi_json (~> 1.0) hike (1.2.1) - i18n (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.3) jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) @@ -61,6 +64,7 @@ GEM mime-types (1.18) multi_json (1.3.6) orm_adapter (0.3.0) + pg (0.13.2) pg (0.13.2-x86-mingw32) polyglot (0.3.3) rack (1.4.1) @@ -110,6 +114,7 @@ GEM rack (>= 1.0) PLATFORMS + ruby x86-mingw32 DEPENDENCIES