Merge branch 'master' into dependabot/bundler/rack-1.6.13

rickreyhsig · Dec 17, 2024 · 4782770 · 4782770
2 parents 1b00526 + 0f43c6f
commit 4782770
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 24 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -42,11 +42,11 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     arel (6.0.4)
     ast (2.4.0)
-    bcrypt (3.1.11)
+    bcrypt (3.1.13)
     better_errors (2.5.0)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
@@ -85,8 +85,8 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     commonjs (0.2.7)
-    concurrent-ruby (1.0.5)
-    crass (1.0.4)
+    concurrent-ruby (1.1.5)
+    crass (1.0.6)
     cucumber (2.4.0)
       builder (>= 2.1.2)
       cucumber-core (~> 1.5.0)
@@ -106,10 +106,10 @@ GEM
     cucumber-wire (0.0.1)
     database_cleaner (1.6.1)
     debug_inspector (0.0.3)
-    devise (4.3.0)
+    devise (4.7.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.2)
+      railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.3)
@@ -128,7 +128,7 @@ GEM
     ffi (1.9.25)
     figaro (1.1.1)
       thor (~> 0.14)
-    geocoder (1.4.4)
+    geocoder (1.6.1)
     gherkin (4.1.3)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
@@ -153,7 +153,7 @@ GEM
       sprockets (> 2, < 4)
       tilt
     libv8 (3.16.14.19)
-    loofah (2.2.3)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.6)
@@ -166,11 +166,11 @@ GEM
       rake
     mini_mime (0.1.4)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.13.0)
     multi_json (1.12.2)
     multi_test (0.1.2)
     multipart-post (2.0.0)
-    nokogiri (1.10.1)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
     parallel (1.13.0)
@@ -188,7 +188,7 @@ GEM
       ttfunk (~> 1.5)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
-    public_suffix (3.0.0)
+    public_suffix (4.0.7)
     rack (1.6.13)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -205,12 +205,11 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
+    rails-html-sanitizer (1.4.4)
     rails-i18n (4.0.9)
       i18n (~> 0.7)
       railties (~> 4.0)
@@ -225,15 +224,15 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
-    rake (12.1.0)
+    rake (13.0.1)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rdoc (4.3.0)
     ref (2.0.0)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
     rollbar (2.20.1)
       multi_json
     rspec-core (3.6.0)
@@ -299,7 +298,7 @@ GEM
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.8)
     ttfunk (1.5.1)
@@ -311,7 +310,7 @@ GEM
       execjs (>= 2.2.2, >= 2.2)
       less-rails (>= 2.5.0)
       railties (>= 3.1)
-    tzinfo (1.2.5)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
@@ -326,7 +325,7 @@ GEM
     websocket (1.2.4)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.5)
     will_paginate (3.0.12)
     xpath (2.1.0)
       nokogiri (~> 1.3)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -3,7 +3,7 @@
 <head>
   <title><%= 'Development | '  if Rails.env.development? %>Pandera - <%= ShippingAddress.where(is_default: true).first.name if ShippingAddress.where(is_default: true).first %></title>
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <script src="https://maps.google.com/maps/api/js?key=AIzaSyBidFVvV0VcvEvoKjMUkmx6VziJaxKZhL4" type="text/javascript"></script>
+    <script src="https://maps.google.com/maps/api/js?key=</>" type="text/javascript"></script>
     <script type="text/javascript" src="https://googlemaps.github.io/js-marker-clusterer/src/markerclusterer.js"></script>
     <script>
     var greenPin = new google.maps.MarkerImage("https://maps.google.com/mapfiles/marker_green.png");