Assert there are no diary comments before creating one.

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 6a3fd950e92a9c10bd661f5d88301023270b7b6d..5a9456b35b34183b587e5567abda772e757a588b 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.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
+    actionmailer (4.2.7)
+      actionpack (= 4.2.7)
+      actionview (= 4.2.7)
+      activejob (= 4.2.7)

       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.6)
-      actionview (= 4.2.6)
-      activesupport (= 4.2.6)
+    actionpack (4.2.7)
+      actionview (= 4.2.7)
+      activesupport (= 4.2.7)

       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.6)
-      activesupport (= 4.2.6)
+    actionview (4.2.7)
+      activesupport (= 4.2.7)

       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.6)
-      activesupport (= 4.2.6)
+    activejob (4.2.7)
+      activesupport (= 4.2.7)

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

-    activemodel (4.2.6)
-      activesupport (= 4.2.6)
+    activemodel (4.2.7)
+      activesupport (= 4.2.7)

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

-    activerecord (4.2.6)
-      activemodel (= 4.2.6)
-      activesupport (= 4.2.6)
+    activerecord (4.2.7)
+      activemodel (= 4.2.7)
+      activesupport (= 4.2.7)

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

-    activesupport (4.2.6)
+    activesupport (4.2.7)

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


@@ -42,7 +42,7 @@ GEM
     addressable (2.4.0)
     arel (6.0.3)
     ast (2.3.0)
     addressable (2.4.0)
     arel (6.0.3)
     ast (2.3.0)

-    autoprefixer-rails (6.3.6.2)
+    autoprefixer-rails (6.3.7)

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


@@ -65,13 +65,13 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)

-    colorize (0.7.7)
+    colorize (0.8.1)

     composite_primary_keys (8.1.3)
       activerecord (~> 4.2.0)
     concurrent-ruby (1.0.2)
     composite_primary_keys (8.1.3)
       activerecord (~> 4.2.0)
     concurrent-ruby (1.0.2)

-    coveralls (0.8.13)
-      json (~> 1.8)
-      simplecov (~> 0.11.0)
+    coveralls (0.8.14)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.12.0)

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


@@ -83,6 +83,11 @@ GEM
     erubis (2.7.0)
     execjs (2.7.0)
     exifr (1.2.4)
     erubis (2.7.0)
     execjs (2.7.0)
     exifr (1.2.4)

+    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)
     fspath (2.1.1)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     fspath (2.1.1)


@@ -93,7 +98,7 @@ GEM
     http_accept_language (2.0.5)
     httpclient (2.8.0)
     i18n (0.7.0)
     http_accept_language (2.0.5)
     httpclient (2.8.0)
     i18n (0.7.0)

-    i18n-js (3.0.0.rc12)
+    i18n-js (3.0.0.rc13)

       i18n (~> 0.6, >= 0.6.6)
     image_optim (0.22.1)
       exifr (~> 1.2, >= 1.2.2)
       i18n (~> 0.6, >= 0.6.6)
     image_optim (0.22.1)
       exifr (~> 1.2, >= 1.2.2)


@@ -130,9 +135,9 @@ GEM
     libv8 (3.16.14.15)
     libxml-ruby (2.9.0)
     logstash-event (1.2.02)
     libv8 (3.16.14.15)
     libxml-ruby (2.9.0)
     logstash-event (1.2.02)

-    logstasher (0.9.0)
-      activerecord (>= 3.0)
-      activesupport (>= 3.0)
+    logstasher (1.0.0)
+      activerecord (>= 4.0)
+      activesupport (>= 4.0)

       logstash-event (~> 1.2.0)
       request_store
     loofah (2.0.3)
       logstash-event (~> 1.2.0)
       request_store
     loofah (2.0.3)


@@ -159,17 +164,20 @@ 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)
+      rack (>= 1.2, < 3)

     omniauth (1.3.1)
       hashie (>= 1.2, < 4)
       rack (>= 1.0, < 3)
     omniauth-facebook (3.0.0)
       omniauth-oauth2 (~> 1.2)
     omniauth (1.3.1)
       hashie (>= 1.2, < 4)
       rack (>= 1.0, < 3)
     omniauth-facebook (3.0.0)
       omniauth-oauth2 (~> 1.2)

+    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-google-oauth2 (0.4.1)
       jwt (~> 1.5.2)
       multi_json (~> 1.3)


@@ -184,7 +192,7 @@ GEM
     omniauth-windowslive (0.0.9.1)
       multi_json (>= 1.0.3)
       omniauth-oauth2 (~> 1.0)
     omniauth-windowslive (0.0.9.1)
       multi_json (>= 1.0.3)
       omniauth-oauth2 (~> 1.0)

-    paperclip (4.3.6)
+    paperclip (4.3.7)

       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       cocaine (~> 0.5.5)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       cocaine (~> 0.5.5)


@@ -194,14 +202,13 @@ GEM
       ast (~> 2.2)
     pg (0.18.4)
     pkg-config (1.1.7)
       ast (~> 2.2)
     pg (0.18.4)
     pkg-config (1.1.7)

-    poltergeist (1.9.0)
+    poltergeist (1.10.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)
     progress (3.1.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
     progress (3.1.1)

-    psych (2.0.17)
+    psych (2.1.0)

     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)


@@ -211,16 +218,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.6)
-      actionmailer (= 4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
-      activemodel (= 4.2.6)
-      activerecord (= 4.2.6)
-      activesupport (= 4.2.6)
+    rails (4.2.7)
+      actionmailer (= 4.2.7)
+      actionpack (= 4.2.7)
+      actionview (= 4.2.7)
+      activejob (= 4.2.7)
+      activemodel (= 4.2.7)
+      activerecord (= 4.2.7)
+      activesupport (= 4.2.7)

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

-      railties (= 4.2.6)
+      railties (= 4.2.7)

       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)


@@ -230,12 +237,12 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)

-    rails-i18n (4.0.8)
+    rails-i18n (4.0.9)

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

-    railties (4.2.6)
-      actionpack (= 4.2.6)
-      activesupport (= 4.2.6)
+    railties (4.2.7)
+      actionpack (= 4.2.7)
+      activesupport (= 4.2.7)

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


@@ -244,8 +251,8 @@ GEM
     ref (2.0.0)
     request_store (1.3.1)
     rinku (2.0.0)
     ref (2.0.0)
     request_store (1.3.1)
     rinku (2.0.0)

-    rubocop (0.40.0)
-      parser (>= 2.3.1.0, < 3.0)
+    rubocop (0.41.2)
+      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)


@@ -257,22 +264,22 @@ GEM
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
     sass (3.4.22)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
     sass (3.4.22)

-    sass-rails (5.0.4)
-      railties (>= 4.0.0, < 5.0)
+    sass-rails (5.0.5)
+      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.2)
+    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)
     soap4r-ruby1.9 (2.0.5)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     soap4r-ruby1.9 (2.0.5)

-    sprockets (3.6.1)
+    sprockets (3.6.3)

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

-    sprockets-rails (3.0.4)
+    sprockets-rails (3.1.1)

       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)


@@ -290,7 +297,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (3.0.0)
       execjs (>= 0.3.0, < 3)
       thread_safe (~> 0.1)
     uglifier (3.0.0)
       execjs (>= 0.3.0, < 3)

-    unicode-display_width (1.0.5)
+    unicode-display_width (1.1.0)

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


@@ -314,6 +321,7 @@ DEPENDENCIES
   dalli
   deadlock_retry (>= 1.2.0)
   dynamic_form
   dalli
   deadlock_retry (>= 1.2.0)
   dynamic_form

+  factory_girl_rails

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


@@ -332,6 +340,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


@@ -342,7 +351,7 @@ DEPENDENCIES
   r2
   rack-cors
   rack-uri_sanitizer
   r2
   rack-cors
   rack-uri_sanitizer

-  rails (= 4.2.6)
+  rails (= 4.2.7)

   rails-i18n (~> 4.0.0)
   redcarpet
   rinku (>= 1.2.2)
   rails-i18n (~> 4.0.0)
   redcarpet
   rinku (>= 1.2.2)