diff --git a/Gemfile.lock b/Gemfile.lock index f3e667d3dc6..68be793a794 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,7 +21,7 @@ GEM activesupport (= 4.1.6) builder (~> 3.1) erubis (~> 2.7.0) - active_model_serializers (0.8.1) + active_model_serializers (0.8.2) activemodel (>= 3.0) activemodel (4.1.6) activesupport (= 4.1.6) @@ -54,14 +54,14 @@ GEM builder (3.2.2) celluloid (0.15.2) timers (~> 1.1.0) - certified (0.1.1) + certified (1.0.0) coderay (1.1.0) connection_pool (2.0.0) crass (0.2.1) daemons (1.1.9) debug_inspector (0.0.2) diff-lcs (1.2.5) - docile (1.1.3) + docile (1.1.5) dotenv (0.11.1) dotenv-deployment (~> 0.0.2) dotenv-deployment (0.0.2) @@ -81,7 +81,7 @@ GEM handlebars-source (~> 1.0) erubis (2.7.0) eventmachine (1.0.3) - excon (0.37.0) + excon (0.39.6) execjs (2.2.1) exifr (1.1.3) fabrication (2.11.3) @@ -96,7 +96,7 @@ GEM rake rake-compiler fast_xs (0.8.0) - fastimage (1.6.0) + fastimage (1.6.3) addressable (~> 2.3, >= 2.3.5) ffi (1.9.4) flamegraph (0.0.5) @@ -107,22 +107,22 @@ GEM fog-json ipaddress (~> 0.5) nokogiri (~> 1.5, >= 1.5.11) - fog-brightbox (0.1.1) + fog-brightbox (0.5.1) fog-core (~> 1.22) fog-json inflecto - fog-core (1.22.0) + fog-core (1.24.0) builder - excon (~> 0.33) + excon (~> 0.38) formatador (~> 0.2) mime-types net-scp (~> 1.1) net-ssh (>= 2.1.3) fog-json (1.0.0) multi_json (~> 1.0) - foreman (0.63.0) - dotenv (>= 0.7) - thor (>= 0.13.6) + foreman (0.75.0) + dotenv (~> 0.11.1) + thor (~> 0.19.1) formatador (0.2.5) fspath (2.0.6) gctools (0.2.3) @@ -131,7 +131,7 @@ GEM guess_html_encoding (0.0.9) handlebars-source (1.3.0) hashie (3.3.1) - highline (1.6.20) + highline (1.6.21) hike (1.2.3) hiredis (0.5.2) htmlentities (4.3.2) @@ -143,15 +143,14 @@ GEM in_threads (~> 1.2.0) progress (~> 3.0.0) image_size (1.1.5) - in_threads (1.2.0) + in_threads (1.2.2) inflecto (0.0.2) ipaddress (0.8.0) jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) - jwt (0.1.11) - multi_json (>= 1.5) + jwt (1.0.0) kgio (2.9.2) librarian (0.1.2) highline @@ -188,12 +187,12 @@ GEM netrc (0.7.7) nokogiri (1.6.3.1) mini_portile (= 0.6.0) - nokogumbo (1.1.9) + nokogumbo (1.1.12) nokogiri oauth (0.4.7) - oauth2 (0.9.3) + oauth2 (1.0.0) faraday (>= 0.8, < 0.10) - jwt (~> 0.1.8) + jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (~> 1.2) @@ -201,21 +200,21 @@ GEM omniauth (1.2.2) hashie (>= 1.2, < 4) rack (~> 1.0) - omniauth-facebook (1.6.0) - omniauth-oauth2 (~> 1.1) + omniauth-facebook (2.0.0) + omniauth-oauth2 (~> 1.2) omniauth-github-discourse (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-google-oauth2 (0.2.4) - omniauth (~> 1.0) + omniauth-google-oauth2 (0.2.5) + omniauth (> 1.0) omniauth-oauth2 (~> 1.1) omniauth-oauth (1.0.1) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.1.2) + omniauth-oauth2 (1.2.0) faraday (>= 0.8, < 0.10) multi_json (~> 1.3) - oauth2 (~> 0.9.3) + oauth2 (~> 1.0) omniauth (~> 1.2) omniauth-openid (1.0.1) omniauth (~> 1.0) @@ -234,12 +233,12 @@ GEM pg (0.15.1) polyglot (0.3.5) progress (3.0.1) - pry (0.9.12.6) - coderay (~> 1.0) - method_source (~> 0.8) + pry (0.10.1) + coderay (~> 1.1.0) + method_source (~> 0.8.1) slop (~> 3.4) - pry-nav (0.2.3) - pry (~> 0.9.10) + pry-nav (0.2.4) + pry (>= 0.9.10, < 0.11.0) pry-rails (0.3.2) pry (>= 0.9.10) puma (2.9.1) @@ -252,7 +251,7 @@ GEM rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-protection (1.5.2) + rack-protection (1.5.3) rack rack-test (0.6.2) rack (>= 1.0) @@ -275,10 +274,10 @@ GEM thor (>= 0.18.1, < 2.0) raindrops (0.13.0) rake (10.3.2) - rake-compiler (0.9.2) + rake-compiler (0.9.3) rake rb-fsevent (0.9.4) - rb-inotify (0.9.3) + rb-inotify (0.9.5) ffi (>= 0.5.0) rbtrace (0.4.5) ffi (>= 1.0.6) @@ -294,40 +293,44 @@ GEM netrc (~> 0.7) rinku (1.7.3) rmmseg-cpp (0.2.9) - rspec (2.14.1) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - rspec-core (2.14.7) - rspec-expectations (2.14.5) - diff-lcs (>= 1.1.3, < 2.0) + rspec (3.1.0) + rspec-core (~> 3.1.0) + rspec-expectations (~> 3.1.0) + rspec-mocks (~> 3.1.0) + rspec-core (3.1.4) + rspec-support (~> 3.1.0) + rspec-expectations (3.1.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.1.0) rspec-given (3.5.4) given_core (= 3.5.4) rspec (>= 2.12) - rspec-mocks (2.14.6) - rspec-rails (2.14.1) + rspec-mocks (3.1.1) + rspec-support (~> 3.1.0) + rspec-rails (3.1.0) actionpack (>= 3.0) - activemodel (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) + rspec-core (~> 3.1.0) + rspec-expectations (~> 3.1.0) + rspec-mocks (~> 3.1.0) + rspec-support (~> 3.1.0) + rspec-support (3.1.0) rtlit (0.0.5) ruby-openid (2.5.0) - ruby-readability (0.6.1) + ruby-readability (0.7.0) guess_html_encoding (>= 0.0.4) - nokogiri (>= 1.4.2) - sanitize (3.0.0) + nokogiri (>= 1.6.0) + sanitize (3.0.2) crass (~> 0.2.0) nokogiri (>= 1.4.4) - nokogumbo (= 1.1.9) - sass (3.2.16) - sass-rails (4.0.2) + nokogumbo (= 1.1.12) + sass (3.2.19) + sass-rails (4.0.3) railties (>= 4.0.0, < 5.0) sass (~> 3.2.0) sprockets (~> 2.8, <= 2.11.0) - sprockets-rails (~> 2.0.0) + sprockets-rails (~> 2.0) seed-fu (2.3.3) activerecord (>= 3.1, < 4.2) activesupport (>= 3.1, < 4.2) @@ -335,7 +338,7 @@ GEM shoulda-context (~> 1.0, >= 1.0.1) shoulda-matchers (>= 1.4.1, < 3.0) shoulda-context (1.2.1) - shoulda-matchers (2.5.0) + shoulda-matchers (2.7.0) activesupport (>= 3.0.0) sidekiq (3.2.5) celluloid (= 0.15.2) @@ -344,9 +347,9 @@ GEM redis (>= 3.0.6) redis-namespace (>= 1.3.1) simple-rss (1.3.1) - simplecov (0.8.2) + simplecov (0.9.1) docile (~> 1.1.0) - multi_json + multi_json (~> 1.0) simplecov-html (~> 0.8.0) simplecov-html (0.8.0) sinatra (1.4.5) @@ -364,7 +367,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.1) + sprockets-rails (2.1.4) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) @@ -390,7 +393,7 @@ GEM uglifier (2.5.3) execjs (>= 0.3.0) json (>= 1.8.0) - unf (0.1.3) + unf (0.1.4) unf_ext unf_ext (0.0.6) unicorn (4.8.3)