Replace messages fixtures with a factory.

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 83d9ae473bce5ca70e45f576d25370da8622279b..d03cd5ad2504d67a9f8dc7a918cc7bdec9febce3 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,38 +2,38 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)

-    actionmailer (4.2.5)
-      actionpack (= 4.2.5)
-      actionview (= 4.2.5)
-      activejob (= 4.2.5)
+    actionmailer (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)

       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)

-    actionpack (4.2.5)
-      actionview (= 4.2.5)
-      activesupport (= 4.2.5)
+    actionpack (4.2.7.1)
+      actionview (= 4.2.7.1)
+      activesupport (= 4.2.7.1)

       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     actionpack-page_caching (1.0.2)
       actionpack (>= 4.0.0, < 5)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     actionpack-page_caching (1.0.2)
       actionpack (>= 4.0.0, < 5)

-    actionview (4.2.5)
-      activesupport (= 4.2.5)
+    actionview (4.2.7.1)
+      activesupport (= 4.2.7.1)

       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)

-    activejob (4.2.5)
-      activesupport (= 4.2.5)
+    activejob (4.2.7.1)
+      activesupport (= 4.2.7.1)

       globalid (>= 0.3.0)
       globalid (>= 0.3.0)

-    activemodel (4.2.5)
-      activesupport (= 4.2.5)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)

       builder (~> 3.1)
       builder (~> 3.1)

-    activerecord (4.2.5)
-      activemodel (= 4.2.5)
-      activesupport (= 4.2.5)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)

       arel (~> 6.0)
       arel (~> 6.0)

-    activesupport (4.2.5)
+    activesupport (4.2.7.1)

       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)


@@ -41,15 +41,13 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.4.0)
     arel (6.0.3)
       tzinfo (~> 1.1)
     addressable (2.4.0)
     arel (6.0.3)

-    ast (2.1.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
-    autoprefixer-rails (6.1.2)
+    ast (2.3.0)
+    autoprefixer-rails (6.5.1)

       execjs
       execjs

-      json

     bigdecimal (1.1.0)
     builder (3.2.2)
     bigdecimal (1.1.0)
     builder (3.2.2)

-    capybara (2.5.0)
+    capybara (2.10.1)
+      addressable

       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)


@@ -60,58 +58,58 @@ GEM
     cliver (0.3.2)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     cliver (0.3.2)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)

-    coffee-rails (4.1.0)
+    coffee-rails (4.1.1)

       coffee-script (>= 2.2.0)
       coffee-script (>= 2.2.0)

-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0, < 5.1.x)

     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)

-    colorize (0.7.7)
-    composite_primary_keys (8.1.1)
+    colorize (0.8.1)
+    composite_primary_keys (8.1.4)

       activerecord (~> 4.2.0)
       activerecord (~> 4.2.0)

-    concurrent-ruby (1.0.0)
-    coveralls (0.8.10)
-      json (~> 1.8)
-      rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.11.0)
+    concurrent-ruby (1.0.2)
+    coveralls (0.8.15)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.12.0)

       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)

-      tins (~> 1.6.0)
+      tins (>= 1.6.0, < 2)

     crass (1.0.2)
     crass (1.0.2)

-    dalli (2.7.4)
+    dalli (2.7.6)

     deadlock_retry (1.2.0)
     docile (1.1.5)
     deadlock_retry (1.2.0)
     docile (1.1.5)

-    domain_name (0.5.25)
-      unf (>= 0.0.5, < 1.0.0)

     dynamic_form (1.1.4)
     erubis (2.7.0)
     dynamic_form (1.1.4)
     erubis (2.7.0)

-    execjs (2.6.0)
-    exifr (1.2.3.1)
+    execjs (2.7.0)
+    exifr (1.2.5)
+    factory_girl (4.7.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.7.0)
+      factory_girl (~> 4.7.0)
+      railties (>= 3.0.0)

     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)

-    fspath (2.1.1)
-    globalid (0.3.6)
+    fspath (3.0.1)
+    geoip (1.6.2)
+    globalid (0.3.7)

       activesupport (>= 4.1.0)
       activesupport (>= 4.1.0)

-    hashie (3.4.3)
+    hashie (3.4.6)

     htmlentities (4.3.4)
     htmlentities (4.3.4)

-    http-cookie (1.0.2)
-      domain_name (~> 0.5)

     http_accept_language (2.0.5)
     http_accept_language (2.0.5)

-    httpclient (2.7.0.1)

     i18n (0.7.0)
     i18n (0.7.0)

-    i18n-js (3.0.0.rc11)
-      i18n (~> 0.6)
-    image_optim (0.22.0)
+    i18n-js (3.0.0.rc14)
+      i18n (~> 0.6, >= 0.6.6)
+    image_optim (0.24.0)

       exifr (~> 1.2, >= 1.2.2)
       exifr (~> 1.2, >= 1.2.2)

-      fspath (~> 2.1)
+      fspath (~> 3.0)

       image_size (~> 1.3)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
       image_size (~> 1.3)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)

-    image_size (1.4.1)
+    image_size (1.4.2)

     in_threads (1.3.1)
     in_threads (1.3.1)

-    jquery-rails (4.0.5)
-      rails-dom-testing (~> 1.0)
+    jquery-rails (4.2.1)
+      rails-dom-testing (>= 1, < 3)

       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jshint (1.4.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jshint (1.4.0)


@@ -124,38 +122,40 @@ GEM
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)

-    jwt (1.5.2)
+    jwt (1.5.6)

     kgio (2.10.0)
     kgio (2.10.0)

-    konacha (3.7.0)
-      actionpack (>= 3.1, < 5)
+    konacha (4.0.0)
+      actionpack (>= 4.1, < 5)

       capybara
       colorize
       capybara
       colorize

-      railties (>= 3.1, < 5)
+      railties (>= 4.1, < 5)

       sprockets (>= 2, < 4)
       sprockets (>= 2, < 4)

+      sprockets-rails (>= 2, < 4)

       tilt
       tilt

-    libv8 (3.16.14.13)
-    libxml-ruby (2.8.0)
+    libv8 (3.16.14.15)
+    libxml-ruby (2.9.0)

     logstash-event (1.2.02)
     logstash-event (1.2.02)

-    logstasher (0.8.6)
-      activerecord (>= 3.0)
-      activesupport (>= 3.0)
+    logstasher (1.0.1)
+      activerecord (>= 4.0)
+      activesupport (>= 4.0)

       logstash-event (~> 1.2.0)
       request_store
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
       logstash-event (~> 1.2.0)
       request_store
     loofah (2.0.3)
       nokogiri (>= 1.5.9)

-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.99)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)

     mimemagic (0.3.0)
     mimemagic (0.3.0)

-    mini_portile2 (2.0.0)
-    minitest (5.8.3)
-    multi_json (1.11.2)
+    mini_portile2 (2.1.0)
+    minitest (5.9.1)
+    multi_json (1.12.1)

     multi_xml (0.5.5)
     multipart-post (2.0.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)

-    netrc (0.11.0)
-    nokogiri (1.6.7)
-      mini_portile2 (~> 2.0.0.rc2)
-    nokogumbo (1.4.1)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    nokogumbo (1.4.9)

       nokogiri
     oauth (0.4.7)
     oauth-plugin (0.5.1)
       nokogiri
     oauth (0.4.7)
     oauth-plugin (0.5.1)


@@ -163,49 +163,50 @@ GEM
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack

-    oauth2 (1.0.0)
+    oauth2 (1.2.0)

       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)

-      rack (~> 1.2)
-    omniauth (1.2.2)
+      rack (>= 1.2, < 3)
+    omniauth (1.3.1)

       hashie (>= 1.2, < 4)
       hashie (>= 1.2, < 4)

-      rack (~> 1.0)
-    omniauth-facebook (3.0.0)
+      rack (>= 1.0, < 3)
+    omniauth-facebook (4.0.0)

       omniauth-oauth2 (~> 1.2)
       omniauth-oauth2 (~> 1.2)

-    omniauth-google-oauth2 (0.2.10)
-      addressable (~> 2.3)
-      jwt (~> 1.0)
+    omniauth-github (1.1.2)
+      omniauth (~> 1.0)
+      omniauth-oauth2 (~> 1.1)
+    omniauth-google-oauth2 (0.4.1)
+      jwt (~> 1.5.2)

       multi_json (~> 1.3)
       omniauth (>= 1.1.1)
       multi_json (~> 1.3)
       omniauth (>= 1.1.1)

-      omniauth-oauth2 (~> 1.3.1)
-    omniauth-oauth2 (1.3.1)
+      omniauth-oauth2 (>= 1.3.1)
+    omniauth-oauth2 (1.4.0)

       oauth2 (~> 1.0)
       omniauth (~> 1.2)
     omniauth-openid (1.0.1)
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
     omniauth-openid (1.0.1)
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)

-    omniauth-windowslive (0.0.9.1)
+    omniauth-windowslive (0.0.11)

       multi_json (>= 1.0.3)
       multi_json (>= 1.0.3)

-      omniauth-oauth2 (~> 1.0)
-    paperclip (4.3.2)
+      omniauth-oauth2 (~> 1.4)
+    paperclip (4.3.7)

       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (= 0.3.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (= 0.3.0)

-    parser (2.2.3.0)
-      ast (>= 1.1, < 3.0)
-    pg (0.18.4)
-    poltergeist (1.8.1)
+    parser (2.3.1.4)
+      ast (~> 2.2)
+    pg (0.19.0)
+    poltergeist (1.11.0)

       capybara (~> 2.1)
       cliver (~> 0.3.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)

-      multi_json (~> 1.0)

       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)

-    progress (3.1.0)
-    psych (2.0.15)
+    progress (3.2.2)
+    psych (2.1.1)

     r2 (0.2.6)
     rack (1.6.4)
     rack-cors (0.4.0)
     r2 (0.2.6)
     rack (1.6.4)
     rack-cors (0.4.0)


@@ -215,16 +216,16 @@ GEM
     rack-test (0.6.3)
       rack (>= 1.0)
     rack-uri_sanitizer (0.0.2)
     rack-test (0.6.3)
       rack (>= 1.0)
     rack-uri_sanitizer (0.0.2)

-    rails (4.2.5)
-      actionmailer (= 4.2.5)
-      actionpack (= 4.2.5)
-      actionview (= 4.2.5)
-      activejob (= 4.2.5)
-      activemodel (= 4.2.5)
-      activerecord (= 4.2.5)
-      activesupport (= 4.2.5)
+    rails (4.2.7.1)
+      actionmailer (= 4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activerecord (= 4.2.7.1)
+      activesupport (= 4.2.7.1)

       bundler (>= 1.3.0, < 2.0)
       bundler (>= 1.3.0, < 2.0)

-      railties (= 4.2.5)
+      railties (= 4.2.7.1)

       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)


@@ -232,81 +233,72 @@ GEM
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)

-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)

       loofah (~> 2.0)
       loofah (~> 2.0)

-    rails-i18n (4.0.7)
+    rails-i18n (4.0.9)

       i18n (~> 0.7)
       railties (~> 4.0)
       i18n (~> 0.7)
       railties (~> 4.0)

-    railties (4.2.5)
-      actionpack (= 4.2.5)
-      activesupport (= 4.2.5)
+    railties (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      activesupport (= 4.2.7.1)

       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)

-    rainbow (2.0.0)
-    rake (10.4.2)
-    redcarpet (3.3.3)
+    rainbow (2.1.0)
+    rake (11.3.0)
+    redcarpet (3.3.4)

     ref (2.0.0)
     ref (2.0.0)

-    request_store (1.2.1)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rinku (1.7.3)
-    rubocop (0.35.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.3.0, < 3.0)
+    request_store (1.3.1)
+    rinku (2.0.2)
+    rubocop (0.44.1)
+      parser (>= 2.3.1.1, < 3.0)

       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)

-      tins (<= 1.6.0)
+      unicode-display_width (~> 1.0, >= 1.0.1)

     ruby-openid (2.7.0)
     ruby-openid (2.7.0)

-    ruby-progressbar (1.7.5)
-    sanitize (4.0.0)
+    ruby-progressbar (1.8.1)
+    sanitize (4.4.0)

       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)

-      nokogumbo (= 1.4.1)
-    sass (3.4.19)
-    sass-rails (5.0.4)
-      railties (>= 4.0.0, < 5.0)
+      nokogumbo (~> 1.4.1)
+    sass (3.4.22)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)

       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)

-    simplecov (0.11.1)
+    simplecov (0.12.0)

       docile (~> 1.1.0)
       docile (~> 1.1.0)

-      json (~> 1.8)
+      json (>= 1.8, < 3)

       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)

-    soap4r-ruby1.9 (2.0.5)
-    sprockets (3.5.1)
+    sprockets (3.7.0)

       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)

-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    term-ansicolor (1.3.2)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    term-ansicolor (1.4.0)

       tins (~> 1.0)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
     thread_safe (0.3.5)
       tins (~> 1.0)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
     thread_safe (0.3.5)

-    tilt (2.0.1)
-    timecop (0.8.0)
-    tins (1.6.0)
+    tilt (2.0.5)
+    timecop (0.8.1)
+    tins (1.12.0)

     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)

-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
+    uglifier (3.0.2)
+      execjs (>= 0.3.0, < 3)
+    unicode-display_width (1.1.1)

     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.1.16)
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.1.16)

-    websocket-driver (0.6.3)
+    websocket-driver (0.6.4)

       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     xpath (2.0.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     xpath (2.0.0)


@@ -326,10 +318,11 @@ DEPENDENCIES
   dalli
   deadlock_retry (>= 1.2.0)
   dynamic_form
   dalli
   deadlock_retry (>= 1.2.0)
   dynamic_form

+  factory_girl_rails

   faraday
   faraday

+  geoip

   htmlentities
   http_accept_language (~> 2.0.0)
   htmlentities
   http_accept_language (~> 2.0.0)

-  httpclient

   i18n-js (>= 3.0.0.rc10)
   image_optim (>= 0.22.0)
   jquery-rails
   i18n-js (>= 3.0.0.rc10)
   image_optim (>= 0.22.0)
   jquery-rails


@@ -344,6 +337,7 @@ DEPENDENCIES
   oauth-plugin (>= 0.5.1)
   omniauth
   omniauth-facebook
   oauth-plugin (>= 0.5.1)
   omniauth
   omniauth-facebook

+  omniauth-github

   omniauth-google-oauth2 (>= 0.2.7)
   omniauth-openid
   omniauth-windowslive
   omniauth-google-oauth2 (>= 0.2.7)
   omniauth-openid
   omniauth-windowslive


@@ -354,15 +348,17 @@ DEPENDENCIES
   r2
   rack-cors
   rack-uri_sanitizer
   r2
   rack-cors
   rack-uri_sanitizer

-  rails (= 4.2.5)
+  rails (= 4.2.7.1)

   rails-i18n (~> 4.0.0)
   redcarpet
   rinku (>= 1.2.2)
   rubocop
   sanitize
   sass-rails (~> 5.0)
   rails-i18n (~> 4.0.0)
   redcarpet
   rinku (>= 1.2.2)
   rubocop
   sanitize
   sass-rails (~> 5.0)

-  soap4r-ruby1.9

   timecop
   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)
   vendorer
   timecop
   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)
   vendorer

+
+BUNDLED WITH
+   1.10.6