Skip to content

Commit

Permalink
Release 1.18.0 (#619)
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit a3ba4b7
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 15fe9f7
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 cc9f2a7
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:
    
    - docker-library/postgres#658
    - docker-library/postgres#681
    - docker-library/postgres#580
    - https://discuss.circleci.com/t/postgresql-image-password-not-specified-issue/34555
  • Loading branch information
DeeDeeG committed Apr 12, 2020
1 parent f3139ce commit 775c67a
Show file tree
Hide file tree
Showing 7 changed files with 1,787 additions and 1,662 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
@@ -1 +1 @@
2.5.7
2.5.8
4 changes: 2 additions & 2 deletions Dockerfile
@@ -1,4 +1,4 @@
FROM ruby:2.5.7-slim
FROM ruby:2.5.8-slim

# Add basic binaries
RUN apt-get update \
Expand All @@ -7,7 +7,7 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*

# Download, extract and install PhantomJS from archive hosted at bitbucket
RUN curl -L https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O \
RUN curl -L https://github.com/Medium/phantomjs/releases/download/v2.1.1/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O \
# Extract and clean up the PhantomJS archive
&& tar xf phantomjs-2.1.1-linux-x86_64.tar.bz2 && rm phantomjs-2.1.1-linux-x86_64.tar.bz2 \
# Install PhantomJS binary to /usr/local/bin
Expand Down
11 changes: 6 additions & 5 deletions Gemfile
@@ -1,18 +1,18 @@
source 'https://rubygems.org'
ruby '2.5.7'
ruby '2.5.8'

gem 'rails', '5.2.2.1'
gem 'rails', '5.2.4.2'

gem 'activeadmin', '~> 1.4.1'
gem 'activeadmin', '~> 2.1'
gem 'bootsnap', require: false
gem 'bootstrap-sass', '>= 3.4.1'
gem 'bugsnag'
gem 'coffee-rails', '~> 4.2'
gem 'country_select'
gem 'devise', '~> 4.6'
gem 'geocoder', '~> 1.2.1'
gem 'grape', '1.1'
gem 'grape-swagger', '~> 0.31'
gem 'grape', '~> 1.3.0'
gem 'grape-swagger'
gem 'grape-kaminari'
gem 'haml'
gem 'high_voltage', '~> 3.0.0'
Expand All @@ -29,6 +29,7 @@ gem 'rack-jsonp'
gem 'rakismet'
gem 'sassc-rails'
gem 'simple_form', '~> 5.0'
gem 'sprockets', '< 4'
gem 'turbolinks'
gem 'uglifier', '>= 1.3.0'
gem 'webpacker', '~> 4'
Expand Down

0 comments on commit 775c67a

Please sign in to comment.