Merge pull request #362 from turingschool-projects/dependabot/bundler…

…/pg-1.1.2 Bump pg from 0.21.0 to 1.1.2
turingschool · Aug 29, 2018 · a1e510a · a1e510a
2 parents 6d83870 + 118bbfb
commit a1e510a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -18,7 +18,7 @@ gem 'graphql-client'
 gem 'honeybadger'
 gem 'jbuilder', '~> 2.5'
 gem 'jquery-rails'
-gem 'pg', '~> 0.18'
+gem 'pg', '~> 1.1'
 gem 'puma', '~> 3.12'
 gem 'rack-cors', require: 'rack/cors'
 gem 'rails', '~> 5.2.1'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -184,7 +184,7 @@ GEM
       mime-types
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
-    pg (0.21.0)
+    pg (1.1.2)
     phantomjs (2.1.1.0)
     poltergeist (1.17.0)
       capybara (~> 2.1)
@@ -333,7 +333,7 @@ DEPENDENCIES
   listen (~> 3.1.5)
   oauth2
   paperclip (~> 6.0.0)
-  pg (~> 0.18)
+  pg (~> 1.1)
   phantomjs
   poltergeist
   pry-rails