Rename user.friend_users to user.friends

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 80f946845823a7a0449bfc99e4373e27db5f682d..23022ad5bd9720cca65dc9d49e1f0ebd2f4aa7c0 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -104,10 +104,10 @@ GEM
     composite_primary_keys (11.1.0)
       activerecord (~> 5.2.1)
     concurrent-ruby (1.1.5)
     composite_primary_keys (11.1.0)
       activerecord (~> 5.2.1)
     concurrent-ruby (1.1.5)

-    config (1.7.1)
+    config (1.7.2)

       activesupport (>= 3.0)
       activesupport (>= 3.0)

-      deep_merge (~> 1.2.1)
-      dry-validation (>= 0.12.2)
+      deep_merge (~> 1.2, >= 1.2.1)
+      dry-validation (~> 0.12, >= 0.12.2, < 1.0.0)

     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)


@@ -125,11 +125,11 @@ GEM
     delayed_job_active_record (4.1.3)
       activerecord (>= 3.0, < 5.3)
       delayed_job (>= 3.0, < 5)
     delayed_job_active_record (4.1.3)
       activerecord (>= 3.0, < 5.3)
       delayed_job (>= 3.0, < 5)

-    docile (1.3.1)
+    docile (1.3.2)

     dry-configurable (0.8.3)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
     dry-configurable (0.8.3)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)

-    dry-container (0.7.0)
+    dry-container (0.7.1)

       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
     dry-core (0.4.7)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
     dry-core (0.4.7)


@@ -189,7 +189,7 @@ GEM
     http_accept_language (2.0.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     http_accept_language (2.0.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)

-    i18n-js (3.2.3)
+    i18n-js (3.3.0)

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


@@ -203,8 +203,8 @@ GEM
       sprockets
     image_size (2.0.1)
     in_threads (1.5.2)
       sprockets
     image_size (2.0.1)
     in_threads (1.5.2)

-    jaro_winkler (1.5.2)
-    jquery-rails (4.3.3)
+    jaro_winkler (1.5.3)
+    jquery-rails (4.3.5)

       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)


@@ -371,8 +371,8 @@ GEM
       unicode-display_width (>= 1.4.0, < 1.7)
     rubocop-performance (1.3.0)
       rubocop (>= 0.68.0)
       unicode-display_width (>= 1.4.0, < 1.7)
     rubocop-performance (1.3.0)
       rubocop (>= 0.68.0)

-    rubocop-rails (2.0.0)
-      rack (>= 2.0)
+    rubocop-rails (2.0.1)
+      rack (>= 1.1)

       rubocop (>= 0.70.0)
     ruby-openid (2.7.0)
     ruby-progressbar (1.10.1)
       rubocop (>= 0.70.0)
     ruby-openid (2.7.0)
     ruby-progressbar (1.10.1)


@@ -385,7 +385,7 @@ GEM
     sassc (2.0.1)
       ffi (~> 1.9)
       rake
     sassc (2.0.1)
       ffi (~> 1.9)
       rake

-    sassc-rails (2.1.1)
+    sassc-rails (2.1.2)

       railties (>= 4.0.0)
       sassc (>= 2.0)
       sprockets (> 3.0)
       railties (>= 4.0.0)
       sassc (>= 2.0)
       sprockets (> 3.0)


@@ -427,9 +427,9 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

-    websocket-driver (0.7.0)
+    websocket-driver (0.7.1)

       websocket-extensions (>= 0.1.0)
       websocket-extensions (>= 0.1.0)

-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.4)

     xpath (3.2.0)
       nokogiri (~> 1.8)
 
     xpath (3.2.0)
       nokogiri (~> 1.8)