Skip to content
This repository has been archived by the owner on Jan 8, 2022. It is now read-only.

Commit

Permalink
Merge 9f20b78 into 1601e17
Browse files Browse the repository at this point in the history
  • Loading branch information
sul-devops-team committed Oct 7, 2019
2 parents 1601e17 + 9f20b78 commit 95cdaf8
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
26 changes: 13 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ GEM
mini_exiftool
nokogiri
ast (2.4.0)
autoprefixer-rails (9.6.1.1)
autoprefixer-rails (9.6.4)
execjs
awesome_print (1.8.0)
bagit (0.4.3)
Expand Down Expand Up @@ -242,7 +242,7 @@ GEM
dry-equalizer (~> 0.2)
dry-types (~> 1.0)
ice_nine (~> 0.11)
dry-types (1.1.1)
dry-types (1.2.0)
concurrent-ruby (~> 1.0)
dry-container (~> 0.3)
dry-core (~> 0.4, >= 0.4.4)
Expand All @@ -256,12 +256,12 @@ GEM
nokogiri (>= 1.4.3)
erubi (1.9.0)
execjs (2.7.0)
factory_bot (5.1.0)
factory_bot (5.1.1)
activesupport (>= 4.2.0)
factory_bot_rails (5.1.0)
factory_bot_rails (5.1.1)
factory_bot (~> 5.1.0)
railties (>= 4.2.0)
faraday (0.16.2)
faraday (0.17.0)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.13.1)
faraday (>= 0.7.4, < 1.0)
Expand All @@ -278,7 +278,7 @@ GEM
http-accept (1.7.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (1.6.0)
i18n (1.7.0)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
iso-639 (0.2.8)
Expand Down Expand Up @@ -361,8 +361,8 @@ GEM
nokogiri (>= 1.4.2)
solrizer (~> 3.3)
orm_adapter (0.5.0)
parallel (1.17.0)
parser (2.6.4.1)
parallel (1.18.0)
parser (2.6.5.0)
ast (~> 2.4.0)
powerpack (0.1.2)
pry (0.12.2)
Expand Down Expand Up @@ -392,8 +392,8 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.2.3)
actionpack (= 5.2.3)
activesupport (= 5.2.3)
Expand Down Expand Up @@ -438,10 +438,10 @@ GEM
faraday (>= 0.9.0)
rspec-core (3.8.2)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.4)
rspec-expectations (3.8.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.1)
rspec-mocks (3.8.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-rails (3.8.2)
Expand All @@ -452,7 +452,7 @@ GEM
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.2)
rspec-support (3.8.3)
rubocop (0.58.2)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
- 3002:3000

db:
image: postgres
image: postgres:11
# No ports shared externally, so that this doesn't conflict with the postgres
# server that TravisCI starts up.
# ports:
Expand Down

0 comments on commit 95cdaf8

Please sign in to comment.