diff --git a/Gemfile.lock b/Gemfile.lock index 3eb6db5b..707ccfbe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,7 +49,7 @@ GEM addressable (2.3.2) arel (3.0.2) bcrypt-ruby (3.0.1) - bootstrap-sass (2.2.2.0) + bootstrap-sass (2.3.0.0) sass (~> 3.2) builder (3.0.4) capybara (2.0.2) @@ -59,8 +59,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.8) + ffi (~> 1.0, >= 1.0.11) chunky_png (1.2.7) coderay (1.0.8) coffee-rails (3.2.2) @@ -89,54 +89,54 @@ GEM devise_simply_stored (0.0.3) devise diff-lcs (1.1.3) - draper (0.18.0) - actionpack (~> 3.2) - activesupport (~> 3.2) + draper (1.1.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + request_store (~> 1.0.3) erubis (2.7.0) eventmachine (1.0.0) execjs (1.4.0) multi_json (~> 1.0) - factory_girl (4.1.0) + factory_girl (4.2.0) activesupport (>= 3.0.0) - factory_girl_rails (4.1.0) - factory_girl (~> 4.1.0) + factory_girl_rails (4.2.1) + factory_girl (~> 4.2.0) railties (>= 3.0.0) - ffi (1.3.1) - fssm (0.2.9) - guard (1.6.1) + ffi (1.4.0) + fssm (0.2.10) + guard (1.6.2) listen (>= 0.6.0) lumberjack (>= 1.0.2) pry (>= 0.9.10) + terminal-table (>= 1.4.3) thor (>= 0.14.6) - guard-rspec (2.3.3) + guard-rspec (2.4.1) guard (>= 1.1) rspec (~> 2.11) - haml (3.1.7) - haml-rails (0.3.5) + haml (4.0.0) + tilt + haml-rails (0.4) actionpack (>= 3.1, < 4.1) activesupport (>= 3.1, < 4.1) - haml (~> 3.1) + haml (>= 3.1, < 4.1) railties (>= 3.1, < 4.1) hike (1.2.1) i18n (0.6.1) journey (1.0.4) - jquery-rails (2.1.4) + jquery-rails (2.2.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.6.7) + json (1.6.8) kaminari (0.14.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) kaminari-bootstrap (0.1.3) kaminari (>= 0.13.0) rails - launchy (2.1.2) + launchy (2.2.0) addressable (~> 2.3) - letter_opener (1.0.0) - launchy (>= 2.0.4) - libwebsocket (0.1.7.1) - addressable - websocket + letter_opener (1.1.0) + launchy (~> 2.2.0) listen (0.7.2) lumberjack (1.0.2) mail (2.4.4) @@ -144,26 +144,26 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) method_source (0.8.1) - mime-types (1.19) - mini_magick (3.4) + mime-types (1.21) + mini_magick (3.5.0) subexec (~> 0.2.1) - multi_json (1.5.0) + multi_json (1.6.1) mustache (0.99.4) nokogiri (1.5.6) orm_adapter (0.0.7) polyglot (0.3.3) - pry (0.9.10) + pry (0.9.12) coderay (~> 1.0.5) method_source (~> 0.8) - slop (~> 3.3.1) + slop (~> 3.4) quiet_assets (1.0.1) railties (~> 3.1) - rack (1.4.3) + rack (1.4.5) rack-cache (1.2) rack (>= 0.4) rack-cors (0.2.7) rack - rack-ssl (1.3.2) + rack-ssl (1.3.3) rack rack-test (0.6.2) rack (>= 1.0) @@ -184,8 +184,9 @@ GEM thor (>= 0.14.6, < 2.0) rake (10.0.3) rb-fsevent (0.9.3) - rdoc (3.12) + rdoc (3.12.1) json (~> 1.4) + request_store (1.0.5) rest-client (1.6.7) mime-types (>= 1.16) rqrcode (0.4.2) @@ -196,7 +197,7 @@ GEM rspec-core (2.12.2) rspec-expectations (2.12.1) diff-lcs (~> 1.1.3) - rspec-mocks (2.12.1) + rspec-mocks (2.12.2) rspec-rails (2.12.2) actionpack (>= 3.0) activesupport (>= 3.0) @@ -207,15 +208,15 @@ GEM ruby_gntp (0.3.4) rubyzip (0.9.9) sass (3.2.5) - sass-rails (3.2.5) + sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.27.2) + selenium-webdriver (2.29.0) childprocess (>= 0.2.5) - libwebsocket (~> 0.1.3) multi_json (~> 1.0) rubyzip + websocket (~> 1.0.4) simple_form (2.0.4) actionpack (~> 3.0) activemodel (~> 3.0) @@ -227,7 +228,7 @@ GEM activesupport (>= 3.0, < 4.1) railties (>= 3.0, < 4.1) slim (~> 1.3) - slop (3.3.3) + slop (3.4.3) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) @@ -238,11 +239,12 @@ GEM rspec-rails (>= 2.5.0) subexec (0.2.2) temple (0.5.5) + terminal-table (1.4.5) thin (1.5.0) daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.16.0) + thor (0.17.0) tilt (1.3.3) treetop (1.4.12) polyglot @@ -253,7 +255,7 @@ GEM multi_json (~> 1.0, >= 1.0.2) warden (1.1.1) rack (>= 1.0) - websocket (1.0.6) + websocket (1.0.7) xpath (1.0.0) nokogiri (~> 1.3)