diff --git a/Gemfile.lock b/Gemfile.lock index 1ffff2b..b6dcd19 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,7 +30,7 @@ GEM multi_json (~> 1.0) addressable (2.3.2) arel (3.0.2) - bcrypt-ruby (3.0.1) + bcrypt (3.1.13) builder (3.0.3) capybara (1.1.3) mime-types (>= 1.16) @@ -51,10 +51,13 @@ GEM coffee-script-source (1.3.3) daemons (1.1.9) database_cleaner (0.9.1) - devise (1.5.3) - bcrypt-ruby (~> 3.0) - orm_adapter (~> 0.0.3) - warden (~> 1.1) + devise (3.5.10) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 3.2.6, < 5) + responders + thread_safe (~> 0.1) + warden (~> 1.2.3) diff-lcs (1.1.2) erubis (2.7.0) eventmachine (1.0.0) @@ -109,14 +112,14 @@ GEM mime-types (1.19) multi_json (1.3.6) nokogiri (1.5.5) - orm_adapter (0.0.7) + orm_adapter (0.5.0) pg (0.14.1) polyglot (0.3.3) pry (0.9.10) coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.3.1) - rack (1.4.1) + rack (1.4.7) rack-cache (1.2) rack (>= 0.4) rack-ssl (1.3.2) @@ -143,6 +146,8 @@ GEM ffi (>= 0.5.0) rdoc (3.12) json (~> 1.4) + responders (1.1.2) + railties (>= 3.2, < 4.2) rspec (2.5.0) rspec-core (~> 2.5.0) rspec-expectations (~> 2.5.0) @@ -183,6 +188,7 @@ GEM eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.16.0) + thread_safe (0.3.6) tilt (1.3.3) treetop (1.4.10) polyglot @@ -191,7 +197,7 @@ GEM uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) - warden (1.2.1) + warden (1.2.7) rack (>= 1.0) xpath (0.1.4) nokogiri (~> 1.3)