Skip to content

Commit

Permalink
Merge branch 'develop' into feature/kithe-thumbnails
Browse files Browse the repository at this point in the history
  • Loading branch information
ewlarson committed Jul 22, 2024
2 parents d9dad0f + 54159e6 commit 027667a
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 18 deletions.
39 changes: 22 additions & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ GEM
net-http-persistent
amazing_print (1.6.0)
ansi (1.5.0)
appsignal (3.7.6)
appsignal (3.12.0)
rack
attr_json (2.3.1)
activerecord (>= 6.0.0, < 7.2)
Expand Down Expand Up @@ -274,7 +274,7 @@ GEM
csv (3.3.0)
database_cleaner (2.0.2)
database_cleaner-active_record (>= 2, < 3)
database_cleaner-active_record (2.1.0)
database_cleaner-active_record (2.2.0)
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
Expand Down Expand Up @@ -306,14 +306,14 @@ GEM
railties (>= 3.2)
down (5.4.2)
addressable (~> 2.8)
dry-cli (1.0.0)
dry-configurable (1.1.0)
dry-cli (1.1.0)
dry-configurable (1.2.0)
dry-core (~> 1.0, < 2)
zeitwerk (~> 2.6)
dry-core (1.0.1)
concurrent-ruby (~> 1.0)
zeitwerk (~> 2.6)
dry-inflector (1.0.0)
dry-inflector (1.1.0)
dry-initializer (3.1.1)
dry-logic (1.5.0)
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -350,8 +350,9 @@ GEM
factory_bot_rails (6.4.3)
factory_bot (~> 6.4)
railties (>= 5.0.0)
faraday (2.9.2)
faraday (2.10.0)
faraday-net_http (>= 2.0, < 3.2)
logger
faraday-net_http (3.1.0)
net-http
faraday-net_http_persistent (2.1.0)
Expand Down Expand Up @@ -443,7 +444,7 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json-schema (4.3.0)
json-schema (4.3.1)
addressable (>= 2.8)
kaminari (1.2.2)
activesupport (>= 4.1.0)
Expand Down Expand Up @@ -489,6 +490,7 @@ GEM
llhttp-ffi (0.5.0)
ffi-compiler (~> 1.0)
rake (~> 13.0)
logger (1.6.0)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand All @@ -512,26 +514,26 @@ GEM
method_source (1.1.0)
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2024.0604)
mime-types-data (3.2024.0702)
mimemagic (0.4.3)
nokogiri (~> 1)
rake
mini_magick (4.9.5)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitar (0.9)
minitest (5.24.0)
minitest (5.24.1)
minitest-ci (3.4.0)
minitest (>= 5.0.6)
minitest-reporters (1.6.1)
minitest-reporters (1.7.1)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
msgpack (1.7.2)
multi_xml (0.7.1)
bigdecimal (~> 3.1)
net-ftp (0.3.6)
net-ftp (0.3.7)
net-protocol
time
net-http (0.4.1)
Expand Down Expand Up @@ -632,8 +634,9 @@ GEM
rb-inotify (0.11.1)
ffi (~> 1.0)
rchardet (1.8.0)
rdf (3.3.1)
rdf (3.3.2)
bcp47_spec (~> 0.2)
bigdecimal (~> 3.1, >= 3.1.5)
link_header (~> 0.0, >= 0.0.8)
rdf-vocab (3.3.1)
rdf (~> 3.3)
Expand All @@ -645,7 +648,7 @@ GEM
actionpack (>= 5.2)
railties (>= 5.2)
retriable (3.1.2)
rexml (3.3.1)
rexml (3.3.2)
strscan
rgeo (3.0.1)
rgeo-geojson (2.1.1)
Expand All @@ -672,8 +675,9 @@ GEM
rspec-support (3.9.4)
ruby-progressbar (1.13.0)
ruby-rc4 (0.1.5)
ruby-vips (2.2.1)
ruby-vips (2.2.2)
ffi (~> 1.12)
logger
rubyzip (2.3.2)
safely_block (0.4.0)
sanitize (6.1.1)
Expand All @@ -700,8 +704,9 @@ GEM
tilt
scrub_rb (1.0.1)
sd_notify (0.1.1)
selenium-webdriver (4.21.1)
selenium-webdriver (4.23.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand Down Expand Up @@ -794,7 +799,7 @@ GEM
vite_rails (3.0.17)
railties (>= 5.1, < 8)
vite_ruby (~> 3.0, >= 3.2.2)
vite_ruby (3.6.0)
vite_ruby (3.7.0)
dry-cli (>= 0.7, < 2)
rack-proxy (~> 0.6, >= 0.6.1)
zeitwerk (~> 2.2)
Expand All @@ -810,7 +815,7 @@ GEM
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
websocket (1.2.10)
websocket (1.2.11)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ Visit the [project wiki](https://github.com/BTAA-Geospatial-Data-Project/geoport

#### Release Version

B1G Geoportal Version v5.8.0 / GeoBlacklight v4.4.0 / GeoBlacklight Admin v0.4.1 (vite branch)
B1G Geoportal Version v5.9.0 / GeoBlacklight v4.4.0 / GeoBlacklight Admin v0.4.1 (vite branch)

0 comments on commit 027667a

Please sign in to comment.