Update bundle

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index e4b521c1ae70132c35ab80002340824946e4af34..08e6c60b440e9f039c303bb5152d5d45c0540f94 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -43,9 +43,12 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)

+    annotate (2.7.2)
+      activerecord (>= 3.2, < 6.0)
+      rake (>= 10.4, < 13.0)

     arel (8.0.0)
     ast (2.3.0)
     arel (8.0.0)
     ast (2.3.0)

-    autoprefixer-rails (7.1.5)
+    autoprefixer-rails (7.1.6)

       execjs
     bigdecimal (1.1.0)
     builder (3.2.3)
       execjs
     bigdecimal (1.1.0)
     builder (3.2.3)


@@ -69,7 +72,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)

-    composite_primary_keys (10.0.0)
+    composite_primary_keys (10.0.1)

       activerecord (~> 5.1.0)
     concurrent-ruby (1.0.5)
     coveralls (0.8.21)
       activerecord (~> 5.1.0)
     concurrent-ruby (1.0.5)
     coveralls (0.8.21)


@@ -84,27 +87,28 @@ GEM
     dalli (2.7.6)
     docile (1.1.5)
     dynamic_form (1.1.4)
     dalli (2.7.6)
     docile (1.1.5)
     dynamic_form (1.1.4)

-    erubi (1.6.1)
+    erubi (1.7.0)

     execjs (2.7.0)
     exifr (1.3.2)
     execjs (2.7.0)
     exifr (1.3.2)

-    factory_girl (4.8.1)
+    factory_bot (4.8.2)

       activesupport (>= 3.0.0)
       activesupport (>= 3.0.0)

-    factory_girl_rails (4.8.0)
-      factory_girl (~> 4.8.0)
+    factory_bot_rails (4.8.2)
+      factory_bot (~> 4.8.2)

       railties (>= 3.0.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.18)
     fspath (3.1.0)
     geoip (1.6.3)
       railties (>= 3.0.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.18)
     fspath (3.1.0)
     geoip (1.6.3)

-    globalid (0.4.0)
+    globalid (0.4.1)

       activesupport (>= 4.2.0)
     hashdiff (0.3.7)
     hashie (3.5.6)
     htmlentities (4.3.4)
     http_accept_language (2.0.5)
       activesupport (>= 4.2.0)
     hashdiff (0.3.7)
     hashie (3.5.6)
     htmlentities (4.3.4)
     http_accept_language (2.0.5)

-    i18n (0.8.6)
-    i18n-js (3.0.1)
+    i18n (0.9.0)
+      concurrent-ruby (~> 1.0)
+    i18n-js (3.0.2)

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


@@ -141,7 +145,7 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     logstash-event (1.2.02)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     logstash-event (1.2.02)

-    logstasher (1.2.1)
+    logstasher (1.2.2)

       activesupport (>= 4.0)
       logstash-event (~> 1.2.0)
       request_store
       activesupport (>= 4.0)
       logstash-event (~> 1.2.0)
       request_store


@@ -222,12 +226,12 @@ GEM
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)

-    progress (3.3.2)
+    progress (3.4.0)

     psych (2.2.4)
     public_suffix (3.0.0)
     r2 (0.2.7)
     rack (2.0.3)
     psych (2.2.4)
     public_suffix (3.0.0)
     r2 (0.2.7)
     rack (2.0.3)

-    rack-cors (1.0.1)
+    rack-cors (1.0.2)

     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)


@@ -266,7 +270,7 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake

-    rake (12.1.0)
+    rake (12.2.1)

     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)


@@ -277,7 +281,7 @@ GEM
     request_store (1.3.2)
     rinku (2.0.3)
     rotp (3.3.0)
     request_store (1.3.2)
     rinku (2.0.3)
     rotp (3.3.0)

-    rubocop (0.50.0)
+    rubocop (0.51.0)

       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)


@@ -292,7 +296,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)

-    sass (3.5.2)
+    sass (3.5.3)

       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)


@@ -303,7 +307,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)

-    secure_headers (4.0.1)
+    secure_headers (5.0.1)

       useragent (>= 0.15.0)
     simplecov (0.14.1)
       docile (~> 1.1.0)
       useragent (>= 0.15.0)
     simplecov (0.14.1)
       docile (~> 1.1.0)


@@ -326,7 +330,7 @@ GEM
     thread_safe (0.3.6)
     tilt (2.0.8)
     tins (1.15.0)
     thread_safe (0.3.6)
     tilt (2.0.8)
     tins (1.15.0)

-    tzinfo (1.2.3)
+    tzinfo (1.2.4)

       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)


@@ -351,6 +355,7 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   actionpack-page_caching
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   actionpack-page_caching

+  annotate

   autoprefixer-rails
   bigdecimal (~> 1.1.0)
   canonical-rails
   autoprefixer-rails
   bigdecimal (~> 1.1.0)
   canonical-rails


@@ -359,7 +364,7 @@ DEPENDENCIES
   coveralls
   dalli
   dynamic_form
   coveralls
   dalli
   dynamic_form

-  factory_girl_rails
+  factory_bot_rails

   faraday
   geoip
   htmlentities
   faraday
   geoip
   htmlentities


@@ -408,4 +413,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
   webmock
 
 BUNDLED WITH

-   1.13.7
+   1.15.4