From 6138470ae981976c0268dbcbfb7e3dc2b698eb82 Mon Sep 17 00:00:00 2001 From: David Cliff Date: Mon, 27 Jan 2020 15:36:50 -0500 Subject: [PATCH] Bundle update - needed to do windows fix for sprockets bug at https://github.com/rails/sprockets/issues/283 - fsutil.exe file SetCaseSensitiveInfo C:\folder\path enable --- .version | 2 +- Gemfile.lock | 39 +++++++++++++++++++-------------------- docker-compose.dev.yml | 2 +- docker-compose.yml | 1 - 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/.version b/.version index b562cd5d..5bd9fbdc 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -0.7.56 +0.7.57 diff --git a/Gemfile.lock b/Gemfile.lock index cd786853..080e98d4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,9 +9,9 @@ GIT GIT remote: https://github.com/projectblacklight/blacklight-gallery.git - revision: 3bf2516d85118b396ab5eca0e60e2e6084739598 + revision: bed6eb39712ee40e85fb016d851122e82759b18d specs: - blacklight-gallery (1.2.1) + blacklight-gallery (1.4.0) blacklight (~> 7.0) bootstrap (~> 4.0) openseadragon (>= 0.2.0) @@ -78,7 +78,7 @@ GEM afm (0.2.2) arel (9.0.0) ast (2.4.0) - autoprefixer-rails (9.7.3) + autoprefixer-rails (9.7.4) execjs bcrypt (3.1.13) blacklight (7.5.0) @@ -94,9 +94,9 @@ GEM popper_js (>= 1.14.3, < 2) sassc-rails (>= 2.0.0) builder (3.2.4) - byebug (11.0.1) - cancancan (3.0.1) - capybara (3.30.0) + byebug (11.1.1) + cancancan (3.0.2) + capybara (3.31.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -113,7 +113,7 @@ GEM mini_mime (>= 0.1.3) coderay (1.1.2) concurrent-ruby (1.1.5) - crass (1.0.5) + crass (1.0.6) croutons (0.0.2) rails (>= 4.1.0) daemons (1.3.1) @@ -133,7 +133,7 @@ GEM devise-guests (0.7.0) devise diff-lcs (1.3) - disposable (0.4.6) + disposable (0.4.7) declarative (>= 0.0.9, < 1.0.0) declarative-builder (< 0.2.0) declarative-option (< 0.2.0) @@ -190,7 +190,7 @@ GEM i18n (>= 0.7) faraday (0.17.3) multipart-post (>= 1.2, < 3) - ffi (1.11.3) + ffi (1.12.1) fileutils (1.4.1) font-awesome-rails (4.7.0.5) railties (>= 3.2, < 6.1) @@ -213,10 +213,10 @@ GEM haml (>= 4.0, < 6) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - i18n (1.8.1) + i18n (1.8.2) concurrent-ruby (~> 1.0) ice_nine (0.11.2) - image_processing (1.10.1) + image_processing (1.10.3) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) iso-639 (0.2.8) @@ -272,7 +272,7 @@ GEM mini_magick (4.10.1) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.13.0) + minitest (5.14.0) mods (2.4.1) edtf iso-639 @@ -313,14 +313,14 @@ GEM ruby-rc4 ttfunk pg (1.2.2) - popper_js (1.14.5) + popper_js (1.16.0) pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (4.0.3) puma (4.3.1) nio4r (~> 2.0) - rack (2.1.0) + rack (2.1.1) rack-test (1.1.0) rack (>= 1.0, < 3) rails (5.2.4.1) @@ -343,8 +343,8 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-healthcheck (1.0.6) - rails (>= 5.2.3) + rails-healthcheck (1.1.2) + rails rails-html-sanitizer (1.3.0) loofah (~> 2.3) railties (5.2.4.1) @@ -380,7 +380,7 @@ GEM actionpack (>= 5.0) railties (>= 5.0) rmagick (2.16.0) - rsolr (2.2.1) + rsolr (2.3.0) builder (>= 2.1.2) faraday (>= 0.9.0) rspec-core (3.9.1) @@ -409,7 +409,7 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rails (2.4.1) + rubocop-rails (2.4.2) rack (>= 1.1) rubocop (>= 0.72.0) ruby-progressbar (1.10.1) @@ -468,7 +468,7 @@ GEM tzinfo (1.2.6) thread_safe (~> 0.1) uber (0.1.0) - unicode-display_width (1.6.0) + unicode-display_width (1.6.1) valkyrie (2.1.0) activemodel activesupport @@ -513,7 +513,6 @@ DEPENDENCIES enumerations factory_bot_rails (= 5.0.1) faker (= 1.9.1) - faraday font-awesome-rails haml-rails jquery-rails diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 522b0a79..f7da3311 100755 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -4,5 +4,5 @@ services: web: build: . volumes: - - .:/home/charon/web + - ./:/home/charon/web - images:/home/charon/images diff --git a/docker-compose.yml b/docker-compose.yml index 10524910..fcc947b5 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,6 @@ version: '3.7' volumes: solr: db: - web: images: services: db: