summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2019-06-16 23:20:04 +0000
committerAsh McKenzie <amckenzie@gitlab.com>2019-06-16 23:20:04 +0000
commit82822945d446acf44176a36da38675e98ca17616 (patch)
tree816306b63874f86a2fb8aab4f7f43c1a1b064ef6
parent32cfec5372247fbd95221c7112093815cd4ca07f (diff)
parent5d3f85945f16ecca6a53cd8d3ddedade2fcdb9a0 (diff)
downloadgitlab-ce-82822945d446acf44176a36da38675e98ca17616.tar.gz
Merge branch 'sh-bump-msgpack' into 'master'
Bump msgpack to 1.2.10 See merge request gitlab-org/gitlab-ce!29730
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 0159d1f96e8..05a926b1b6c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -505,7 +505,7 @@ GEM
mini_mime (1.0.1)
mini_portile2 (2.4.0)
minitest (5.11.3)
- msgpack (1.2.6)
+ msgpack (1.2.10)
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)