Closed DeeDeeG closed 4 years ago
PLEASE use the following text for the squashed commit message, thanks:
Squashed commit of the following:
commit a3ba4b7e1a12bc5f4836849d4e46fdb53187fcca
Author: DeeDeeG <DeeDeeG@users.noreply.github.com>
Date: Fri Apr 3 22:10:09 2020 -0400
Update Node.JS and Ruby Dependencies (#617)
* Gemfile[.lock]: Update rails to 5.2.4.2
Also update its dependencies, as required.
* Gemfile[.lock]: Update grape and grape-swagger
Also update their dependencies, as needed.
* Gemfile[.lock]: Update activeadmin
* Gemfile: Pin sprockets to "< 4"
The 4.x major version upgrade requires some configuration changes.
Pinning keeps the app from breaking when doing `bundle update`.
* Gemfile.lock: Update all packages
* yarn.lock: Update all packages
commit 15fe9f72c134e145deee2e4e8d1662f9997a0dec
Author: DeeDeeG <DeeDeeG@users.noreply.github.com>
Date: Thu Apr 2 16:02:39 2020 -0400
Ruby: Update from 2.5.7 to 2.5.8 (#618)
commit cc9f2a7c6128b88429e28bec633c07c4c5d8e733
Author: DeeDeeG <DeeDeeG@users.noreply.github.com>
Date: Tue Mar 17 15:02:57 2020 -0400
Update docker config (#616)
* Dockerfile: Use better PhantomJS URL
GitHub's CDN is more reliable than BitBucket's.
(This is the URL we originally used as of PR #435,
which was the initial implementation of our Docker setup.)
* docker-compose.yml: Add password for PostgreSQL db
This is in response to a recent change in the PostgreSQL Docker image.
Either the database must be configured to not check passwords, i.e.
`POSTGRESQL_HOST_AUTH_METHOD=trust`, or a password must now be set.
For explanation and context, see:
- https://github.com/docker-library/postgres/pull/658
- https://github.com/docker-library/postgres/issues/681
- https://github.com/docker-library/postgres/issues/580
- https://discuss.circleci.com/t/postgresql-image-password-not-specified-issue/34555
On the other hand, I'm happy to squash and merge myself with that commit message, preferably after an "approved" review from somebody else.
Context
Dockerfile
configChanges
616
617
618
Checklist