Merge branch 'release/5.3.1' of github.com:PecanProject/bety into release/5.3.1

Author: robkooper

.ruby-version

@@ -1 +1 @@
-ruby-2.3.8
+ruby-2.5.9

Gemfile

@@ -1,14 +1,14 @@
 source "http://rubygems.org"
 
-gem "rails", "5.1.7"
+gem "rails", "5.2.4.5"
 # needed for rails 3.1 and above until we phase out prototype:
 ## gem 'prototype-rails', github: 'rails/prototype-rails', branch: '4.2' # see https://github.com/rails/prototype-rails/issues/37
 gem "nokogiri"
 gem "narray", "0.6.0.4"
 gem "choice", "0.1.6"
 gem "comma", "~> 4.3.2"
 gem "json"
-gem "rgeo", "~> 0.5.0"
+gem "rgeo"
 gem "multi_json"
 gem "railroad", "0.5.0"
 gem "recaptcha", "4.8.0", :require => "recaptcha/rails"

Gemfile.lock

@@ -1,52 +1,56 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actioncable (5.1.7)
-      actionpack (= 5.1.7)
+    actioncable (5.2.4.5)
+      actionpack (= 5.2.4.5)
       nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.7)
-      actionpack (= 5.1.7)
-      actionview (= 5.1.7)
-      activejob (= 5.1.7)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.4.5)
+      actionpack (= 5.2.4.5)
+      actionview (= 5.2.4.5)
+      activejob (= 5.2.4.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.7)
-      actionview (= 5.1.7)
-      activesupport (= 5.1.7)
-      rack (~> 2.0)
+    actionpack (5.2.4.5)
+      actionview (= 5.2.4.5)
+      activesupport (= 5.2.4.5)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.7)
-      activesupport (= 5.1.7)
+    actionview (5.2.4.5)
+      activesupport (= 5.2.4.5)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.7)
-      activesupport (= 5.1.7)
+    activejob (5.2.4.5)
+      activesupport (= 5.2.4.5)
       globalid (>= 0.3.6)
-    activemodel (5.1.7)
-      activesupport (= 5.1.7)
+    activemodel (5.2.4.5)
+      activesupport (= 5.2.4.5)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (5.1.7)
-      activemodel (= 5.1.7)
-      activesupport (= 5.1.7)
-      arel (~> 8.0)
-    activerecord-postgis-adapter (5.0.3)
+    activerecord (5.2.4.5)
+      activemodel (= 5.2.4.5)
+      activesupport (= 5.2.4.5)
+      arel (>= 9.0)
+    activerecord-postgis-adapter (5.2.3)
       activerecord (~> 5.1)
-      rgeo-activerecord (~> 5.1)
-    activerecord-session_store (1.1.3)
-      actionpack (>= 4.0)
-      activerecord (>= 4.0)
+      rgeo-activerecord (~> 6.0)
+    activerecord-session_store (2.0.0)
+      actionpack (>= 5.2.4.1)
+      activerecord (>= 5.2.4.1)
       multi_json (~> 1.11, >= 1.11.2)
-      rack (>= 1.5.2, < 3)
-      railties (>= 4.0)
-    activesupport (5.1.7)
+      rack (>= 2.0.8, < 3)
+      railties (>= 5.2.4.1)
+    activestorage (5.2.4.5)
+      actionpack (= 5.2.4.5)
+      activerecord (= 5.2.4.5)
+      marcel (~> 0.3.1)
+    activesupport (5.2.4.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -55,11 +59,11 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     apipie-rails (0.5.6)
       rails (>= 4.1)
-    arel (8.0.0)
+    arel (9.0.0)
     bootstrap-will_paginate (1.0.0)
       will_paginate
     builder (3.2.4)
-    byebug (11.0.1)
+    byebug (11.1.3)
     capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)
@@ -72,121 +76,132 @@ GEM
       json
     childprocess (3.0.0)
     choice (0.1.6)
-    coderay (1.1.2)
-    coffee-rails (4.2.2)
+    coderay (1.1.3)
+    coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0)
+      railties (>= 5.2.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
     comma (4.3.2)
       activesupport (>= 4.2.0, < 6.1)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
-    database_cleaner (1.8.4)
-    diff-lcs (1.3)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    diff-lcs (1.4.4)
     dynamic_form (1.1.4)
-    erubi (1.9.0)
-    execjs (2.7.0)
-    ffi (1.12.2)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.2)
+    erubi (1.10.0)
+    execjs (2.8.1)
+    ffi (1.15.4)
+    globalid (0.5.2)
+      activesupport (>= 5.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jquery-rails (4.3.5)
+    jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (2.3.0)
+    json (2.5.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
-    kgio (2.11.3)
-    loofah (2.5.0)
+    kgio (2.11.4)
+    loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
     memoist (0.16.2)
     method_source (1.0.0)
-    mini_mime (1.0.2)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
+    mini_mime (1.1.1)
     mini_portile2 (2.6.1)
-    minitest (5.14.0)
-    multi_json (1.14.1)
+    minitest (5.14.4)
+    multi_json (1.15.0)
     mustache (1.1.1)
     narray (0.6.0.4)
-    nio4r (2.5.2)
+    nio4r (2.5.8)
     nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     optimist (3.0.1)
-    passenger (6.0.4)
+    passenger (6.0.11)
       rack
       rake (>= 0.8.1)
     pg (1.2.3)
-    protected_attributes_continued (1.5.0)
+    protected_attributes_continued (1.8.2)
       activemodel (>= 5.0)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.7.0)
+    pry-byebug (3.8.0)
       byebug (~> 11.0)
       pry (~> 0.10)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.6)
-    rabl (0.14.3)
+    rabl (0.14.5)
       activesupport (>= 2.3.14)
     racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     railroad (0.5.0)
-    rails (5.1.7)
-      actioncable (= 5.1.7)
-      actionmailer (= 5.1.7)
-      actionpack (= 5.1.7)
-      actionview (= 5.1.7)
-      activejob (= 5.1.7)
-      activemodel (= 5.1.7)
-      activerecord (= 5.1.7)
-      activesupport (= 5.1.7)
+    rails (5.2.4.5)
+      actioncable (= 5.2.4.5)
+      actionmailer (= 5.2.4.5)
+      actionpack (= 5.2.4.5)
+      actionview (= 5.2.4.5)
+      activejob (= 5.2.4.5)
+      activemodel (= 5.2.4.5)
+      activerecord (= 5.2.4.5)
+      activestorage (= 5.2.4.5)
+      activesupport (= 5.2.4.5)
       bundler (>= 1.3.0)
-      railties (= 5.1.7)
+      railties (= 5.2.4.5)
       sprockets-rails (>= 2.0.0)
-    rails-controller-testing (1.0.4)
-      actionpack (>= 5.0.1.x)
-      actionview (>= 5.0.1.x)
-      activesupport (>= 5.0.1.x)
+    rails-controller-testing (1.0.5)
+      actionpack (>= 5.0.1.rc1)
+      actionview (>= 5.0.1.rc1)
+      activesupport (>= 5.0.1.rc1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
     rails3-restful-authentication (3.0.1)
-    railties (5.1.7)
-      actionpack (= 5.1.7)
-      activesupport (= 5.1.7)
+    railties (5.2.4.5)
+      actionpack (= 5.2.4.5)
+      activesupport (= 5.2.4.5)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    raindrops (0.19.1)
-    rake (13.0.1)
+      thor (>= 0.19.0, < 2.0)
+    raindrops (0.19.2)
+    rake (13.0.6)
     recaptcha (4.8.0)
       json
-    rgeo (0.5.3)
-    rgeo-activerecord (5.1.1)
-      activerecord (~> 5.0)
-      rgeo (~> 0.3)
+    rgeo (2.3.0)
+    rgeo-activerecord (6.2.2)
+      activerecord (>= 5.0)
+      rgeo (>= 1.0.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
@@ -200,7 +215,7 @@ GEM
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.4)
     rspec_api_documentation (6.1.0)
       activesupport (>= 3.0.0)
       mustache (~> 1.0, >= 0.99.4)
@@ -211,7 +226,7 @@ GEM
       activerecord (>= 3.0.0)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
-    sassc (2.3.0)
+    sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
       railties (>= 4.0.0)
@@ -223,31 +238,31 @@ GEM
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    sprockets (3.7.2)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (1.0.1)
+    thor (1.1.0)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tzinfo (1.2.7)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unicorn (5.5.5)
+    unicorn (6.0.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
-    websocket-driver (0.6.5)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    will_paginate (3.3.0)
+    will_paginate (3.3.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yajl-ruby (1.3.1)
-    yard (0.9.24)
+    yard (0.9.26)
 
 PLATFORMS
   ruby
@@ -282,11 +297,11 @@ DEPENDENCIES
   pry-rails
   rabl
   railroad (= 0.5.0)
-  rails (= 5.1.7)
+  rails (= 5.2.4.5)
   rails-controller-testing
   rails3-restful-authentication (~> 3.0.1)
   recaptcha (= 4.8.0)
-  rgeo (~> 0.5.0)
+  rgeo
   rspec-rails (~> 3.0)
   rspec_api_documentation
   ruby-graphviz (= 1.0.8)

app/assets/config/manifest.js

@@ -0,0 +1,16 @@
+// app/assets/config/manifest.js
+//
+// = link application.css
+// = link bulk_upload.css
+// = link schemaSpy.css
+//
+// = link application.js
+// = link lazy/login.js
+// = link lazy/map_search.js
+// = link lazy/feedback.js
+// = link lazy/autocomplete.js
+// = link lazy/bulk_upload.js
+//
+// = link mylibs/maps.js
+//
+// = link_directory ../images