diff --git a/Gemfile.lock b/Gemfile.lock index 791912deda..7564ff07ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -135,7 +135,7 @@ GEM i18n (~> 0.6) multi_json (~> 1.0) acts_as_list (0.1.4) - addressable (2.3.2) + addressable (2.3.3) andand (1.3.3) ansi (1.4.2) arel (3.0.2) @@ -160,8 +160,8 @@ GEM rack-test (>= 0.5.4) selenium-webdriver (~> 2.0) xpath (~> 1.0.0) - childprocess (0.3.6) - ffi (~> 1.0, >= 1.0.6) + childprocess (0.3.9) + ffi (~> 1.0, >= 1.0.11) chunky_png (1.2.7) climate_control (0.0.3) activesupport (>= 3.0) @@ -216,7 +216,7 @@ GEM faker (1.0.1) i18n (~> 0.4) ffaker (1.12.1) - ffi (1.3.1) + ffi (1.4.0) fssm (0.2.10) haml (3.1.6) highline (1.6.11) @@ -240,9 +240,6 @@ GEM letter_opener (1.0.0) launchy (>= 2.0.4) libv8 (3.3.10.4) - libwebsocket (0.1.7.1) - addressable - websocket mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -335,11 +332,11 @@ GEM select2-rails (3.3.0) sass-rails (~> 3.2) thor (~> 0.14) - selenium-webdriver (2.27.2) + selenium-webdriver (2.31.0) childprocess (>= 0.2.5) - libwebsocket (~> 0.1.3) multi_json (~> 1.0) rubyzip + websocket (~> 1.0.4) shoulda-matchers (1.1.0) activesupport (>= 3.0.0) slop (3.3.3) @@ -376,7 +373,7 @@ GEM railties (>= 3.0) warden (1.2.1) rack (>= 1.0) - websocket (1.0.6) + websocket (1.0.7) xpath (1.0.0) nokogiri (~> 1.3)