diff --git a/Gemfile.lock b/Gemfile.lock index dd0081e..023d260 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,7 +31,9 @@ GEM multi_json (~> 1.0) ansi (1.4.1) arel (2.2.1) - bcrypt-ruby (3.0.1) + bcrypt (3.1.13) + bcrypt-ruby (3.1.5) + bcrypt (>= 3.1.3) builder (3.0.0) capybara (1.1.2) mime-types (>= 1.16) @@ -49,10 +51,11 @@ GEM coffee-script-source execjs coffee-script-source (1.2.0) - devise (1.5.3) + devise (2.2.8) bcrypt-ruby (~> 3.0) - orm_adapter (~> 0.0.3) - warden (~> 1.1) + orm_adapter (~> 0.1) + railties (~> 3.1) + warden (~> 1.2.1) diff-lcs (1.1.3) erubis (2.7.0) execjs (1.2.13) @@ -85,9 +88,9 @@ GEM mime-types (1.17.2) multi_json (1.0.4) nokogiri (1.5.0) - orm_adapter (0.0.5) + orm_adapter (0.5.0) polyglot (0.3.3) - rack (1.3.5) + rack (1.3.10) rack-cache (1.1) rack (>= 0.4) rack-mount (0.8.3) @@ -158,7 +161,7 @@ GEM uglifier (1.2.0) execjs (>= 0.3.0) multi_json (>= 1.0.2) - warden (1.1.0) + warden (1.2.7) rack (>= 1.0) xpath (0.1.4) nokogiri (~> 1.3)