Use options_for_select to set the selected items in the search form

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 7dd619b614206efc9c460f5715dfff646adf6531..02bb3e5fdbeaf3634243e6ca46721cdddf7caaa2 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,41 +2,42 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)

-    actioncable (5.1.4)
-      actionpack (= 5.1.4)
+    aasm (4.1.0)
+    actioncable (5.1.5)
+      actionpack (= 5.1.5)

       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)

-    actionmailer (5.1.4)
-      actionpack (= 5.1.4)
-      actionview (= 5.1.4)
-      activejob (= 5.1.4)
+    actionmailer (5.1.5)
+      actionpack (= 5.1.5)
+      actionview (= 5.1.5)
+      activejob (= 5.1.5)

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

-    actionpack (5.1.4)
-      actionview (= 5.1.4)
-      activesupport (= 5.1.4)
+    actionpack (5.1.5)
+      actionview (= 5.1.5)
+      activesupport (= 5.1.5)

       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     actionpack-page_caching (1.1.0)
       actionpack (>= 4.0.0, < 6)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     actionpack-page_caching (1.1.0)
       actionpack (>= 4.0.0, < 6)

-    actionview (5.1.4)
-      activesupport (= 5.1.4)
+    actionview (5.1.5)
+      activesupport (= 5.1.5)

       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)

-    activejob (5.1.4)
-      activesupport (= 5.1.4)
+    activejob (5.1.5)
+      activesupport (= 5.1.5)

       globalid (>= 0.3.6)
       globalid (>= 0.3.6)

-    activemodel (5.1.4)
-      activesupport (= 5.1.4)
-    activerecord (5.1.4)
-      activemodel (= 5.1.4)
-      activesupport (= 5.1.4)
+    activemodel (5.1.5)
+      activesupport (= 5.1.5)
+    activerecord (5.1.5)
+      activemodel (= 5.1.5)
+      activesupport (= 5.1.5)

       arel (~> 8.0)
       arel (~> 8.0)

-    activesupport (5.1.4)
+    activesupport (5.1.5)

       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)


@@ -47,14 +48,14 @@ GEM
       activerecord (>= 3.2, < 6.0)
       rake (>= 10.4, < 13.0)
     arel (8.0.0)
       activerecord (>= 3.2, < 6.0)
       rake (>= 10.4, < 13.0)
     arel (8.0.0)

-    ast (2.3.0)
-    autoprefixer-rails (7.2.5)
+    ast (2.4.0)
+    autoprefixer-rails (8.0.0)

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

-    canonical-rails (0.2.1)
+    canonical-rails (0.2.2)

       rails (>= 4.1, < 5.2)
       rails (>= 4.1, < 5.2)

-    capybara (2.17.0)
+    capybara (2.18.0)

       addressable
       mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)


@@ -72,8 +73,8 @@ 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.2)
-      activerecord (~> 5.1.0, >= 5.1.4)
+    composite_primary_keys (10.0.3)
+      activerecord (~> 5.1.0, >= 5.1.5)

     concurrent-ruby (1.0.5)
     coveralls (0.8.21)
       json (>= 1.8, < 3)
     concurrent-ruby (1.0.5)
     coveralls (0.8.21)
       json (>= 1.8, < 3)


@@ -97,7 +98,7 @@ GEM
       railties (>= 3.0.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
       railties (>= 3.0.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)

-    ffi (1.9.18)
+    ffi (1.9.23)

     fspath (3.1.0)
     geoip (1.6.3)
     globalid (0.4.1)
     fspath (3.1.0)
     geoip (1.6.3)
     globalid (0.4.1)


@@ -106,9 +107,9 @@ GEM
     hashie (3.5.7)
     htmlentities (4.3.4)
     http_accept_language (2.0.5)
     hashie (3.5.7)
     htmlentities (4.3.4)
     http_accept_language (2.0.5)

-    i18n (0.9.3)
+    i18n (0.9.5)

       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)

-    i18n-js (3.0.3)
+    i18n-js (3.0.4)

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


@@ -137,9 +138,9 @@ GEM
       actionpack
       jsonify (< 0.4.0)
     jwt (1.5.6)
       actionpack
       jsonify (< 0.4.0)
     jwt (1.5.6)

-    kgio (2.11.1)
+    kgio (2.11.2)

     libv8 (3.16.14.19)
     libv8 (3.16.14.19)

-    libxml-ruby (3.0.0)
+    libxml-ruby (3.1.0)

     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)


@@ -149,7 +150,7 @@ GEM
       activesupport (>= 4.0)
       logstash-event (~> 1.2.0)
       request_store
       activesupport (>= 4.0)
       logstash-event (~> 1.2.0)
       request_store

-    loofah (2.1.1)
+    loofah (2.2.0)

       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)


@@ -161,14 +162,14 @@ GEM
     mimemagic (0.3.2)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     mimemagic (0.3.2)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)

-    minitest (5.11.1)
+    minitest (5.11.3)

     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nio4r (2.2.0)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nio4r (2.2.0)

-    nokogiri (1.8.1)
+    nokogiri (1.8.2)

       mini_portile2 (~> 2.3.0)
       mini_portile2 (~> 2.3.0)

-    nokogumbo (1.4.13)
+    nokogumbo (1.5.0)

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


@@ -190,11 +191,10 @@ GEM
     omniauth-github (1.3.0)
       omniauth (~> 1.5)
       omniauth-oauth2 (>= 1.4.0, < 2.0)
     omniauth-github (1.3.0)
       omniauth (~> 1.5)
       omniauth-oauth2 (>= 1.4.0, < 2.0)

-    omniauth-google-oauth2 (0.5.2)
-      jwt (~> 1.5)
-      multi_json (~> 1.3)
+    omniauth-google-oauth2 (0.5.3)
+      jwt (>= 1.5)

       omniauth (>= 1.1.1)
       omniauth (>= 1.1.1)

-      omniauth-oauth2 (>= 1.3.1)
+      omniauth-oauth2 (>= 1.5)

     omniauth-mediawiki (0.0.3)
       jwt (~> 1.0)
       omniauth-oauth (~> 1.0)
     omniauth-mediawiki (0.0.3)
       jwt (~> 1.0)
       omniauth-oauth (~> 1.0)


@@ -211,15 +211,15 @@ GEM
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.0)
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.0)

-    paperclip (5.2.0)
+    paperclip (5.2.1)

       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
     parallel (1.12.1)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
     parallel (1.12.1)

-    parser (2.4.0.2)
-      ast (~> 2.3)
+    parser (2.5.0.2)
+      ast (~> 2.4.0)

     pg (0.21.0)
     poltergeist (1.17.0)
       capybara (~> 2.1)
     pg (0.21.0)
     poltergeist (1.17.0)
       capybara (~> 2.1)


@@ -228,10 +228,10 @@ GEM
     powerpack (0.1.1)
     progress (3.4.0)
     psych (3.0.2)
     powerpack (0.1.1)
     progress (3.4.0)
     psych (3.0.2)

-    public_suffix (3.0.1)
+    public_suffix (3.0.2)

     puma (3.11.2)
     r2 (0.2.7)
     puma (3.11.2)
     r2 (0.2.7)

-    rack (2.0.3)
+    rack (2.0.4)

     rack-cors (1.0.2)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
     rack-cors (1.0.2)
     rack-openid (1.3.1)
       rack (>= 1.1.0)


@@ -239,17 +239,17 @@ GEM
     rack-test (0.8.2)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)
     rack-test (0.8.2)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)

-    rails (5.1.4)
-      actioncable (= 5.1.4)
-      actionmailer (= 5.1.4)
-      actionpack (= 5.1.4)
-      actionview (= 5.1.4)
-      activejob (= 5.1.4)
-      activemodel (= 5.1.4)
-      activerecord (= 5.1.4)
-      activesupport (= 5.1.4)
+    rails (5.1.5)
+      actioncable (= 5.1.5)
+      actionmailer (= 5.1.5)
+      actionpack (= 5.1.5)
+      actionview (= 5.1.5)
+      activejob (= 5.1.5)
+      activemodel (= 5.1.5)
+      activerecord (= 5.1.5)
+      activesupport (= 5.1.5)

       bundler (>= 1.3.0)
       bundler (>= 1.3.0)

-      railties (= 5.1.4)
+      railties (= 5.1.5)

       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.2)
       actionpack (~> 5.x, >= 5.0.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.2)
       actionpack (~> 5.x, >= 5.0.1)


@@ -263,9 +263,9 @@ GEM
     rails-i18n (4.0.2)
       i18n (~> 0.6)
       rails (>= 4.0)
     rails-i18n (4.0.2)
       i18n (~> 0.6)
       rails (>= 4.0)

-    railties (5.1.4)
-      actionpack (= 5.1.4)
-      activesupport (= 5.1.4)
+    railties (5.1.5)
+      actionpack (= 5.1.5)
+      activesupport (= 5.1.5)

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


@@ -293,10 +293,10 @@ GEM
     ruby-progressbar (1.9.0)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
     ruby-progressbar (1.9.0)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)

-    sanitize (4.5.0)
+    sanitize (4.6.0)

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

-      nokogumbo (~> 1.4.1)
+      nokogumbo (~> 1.4)

     sass (3.5.5)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
     sass (3.5.5)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)


@@ -308,7 +308,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 (5.0.4)
+    secure_headers (5.0.5)

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


@@ -331,12 +331,12 @@ GEM
     thread_safe (0.3.6)
     tilt (2.0.8)
     tins (1.16.3)
     thread_safe (0.3.6)
     tilt (2.0.8)
     tins (1.16.3)

-    tzinfo (1.2.4)
+    tzinfo (1.2.5)

       thread_safe (~> 0.1)
       thread_safe (~> 0.1)

-    uglifier (4.1.4)
+    uglifier (4.1.6)

       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.3.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.3.0)

-    useragent (0.16.9)
+    useragent (0.16.10)

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


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

+  aasm

   actionpack-page_caching
   annotate
   autoprefixer-rails
   actionpack-page_caching
   annotate
   autoprefixer-rails


@@ -399,7 +400,7 @@ DEPENDENCIES
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer

-  rails (= 5.1.4)
+  rails (= 5.1.5)

   rails-controller-testing
   rails-i18n (~> 4.0.0)
   record_tag_helper
   rails-controller-testing
   rails-i18n (~> 4.0.0)
   record_tag_helper