Merge branch 'sh-bump-pg-gem-1.2.2' into 'master'

Update pg gem to v1.2.2 See merge request gitlab-org/gitlab!23237

Merge branch 'sh-bump-pg-gem-1.2.2' into 'master'
Update pg gem to v1.2.2 See merge request gitlab-org/gitlab!23237
1ef9c067 · Jan Provaznik · 0d2550b0 · 046cec04 · 1ef9c067 · 1ef9c067
Commit 1ef9c067 authored Jan 21, 2020 by Jan Provaznik
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

changelogs/unreleased/sh-bump-pg-gem-1-2-2.yml changelogs/unreleased/sh-bump-pg-gem-1-2-2.yml +5 -0

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -741,7 +741,7 @@ GEM
    parslet (1.8.2)
    peek (1.1.0)
      railties (>= 4.0.0)
-    pg (1.1.4)
+    pg (1.2.2)
    png_quantizator (0.2.1)
    po_to_json (1.0.1)
      json (>= 1.6.0)

--- a/changelogs/unreleased/sh-bump-pg-gem-1-2-2.yml
+++ b/changelogs/unreleased/sh-bump-pg-gem-1-2-2.yml
+---
+title: Update pg gem to v1.2.2
+merge_request: 23237
+author:
+type: other