v3.2.3

Merge pull request #834 from TechforgoodCAST/develop
TechforgoodCAST · Mar 31, 2020 · 30136f4 · 30136f4
2 parents b77c490 + 0ab9945
commit 30136f4
Show file tree

Hide file tree

Showing 14 changed files with 175 additions and 269 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,7 +5,7 @@ jobs:
     working_directory: ~/beehive-giving
     parallelism: 1
     docker:
-      - image: circleci/ruby:2.5.3-node-browsers
+      - image: circleci/ruby:2.5.5-node-browsers
         environment:
           PGHOST: localhost
           PGUSER: beehive-giving
@@ -14,7 +14,7 @@ jobs:
         environment:
           POSTGRES_USER: beehive-giving
           POSTGRES_DB: beehive_giving_test
-          POSTGRES_PASSWORD: ""
+          POSTGRES_PASSWORD: password
 
     steps:
       - checkout

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.5.3
+2.5.5
diff --git a/Gemfile b/Gemfile
@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
-ruby '2.5.3'
+ruby '2.5.5'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.2.2.1'
 # Use postgresql as the database for Active Record
-gem 'pg', '~> 0.18'
+gem 'pg', '>= 0.18', '< 2.0'
 # Use Puma as the app server
 gem 'puma', '~> 3.7'
 # Use SCSS for stylesheets