summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-08-13 19:48:14 +0000
committerRobert Speicher <robert@gitlab.com>2018-08-13 19:48:14 +0000
commitfe441cc0d1b32f28b4e5ee048f7aa2f974904c17 (patch)
tree73d56fbb4c45087a2e10d3855f4f1d2734584562
parentfcee676ca1ddb95aa627c2c616a11edf4cbd6c30 (diff)
parent89ec4a3e449983010d8aa9e666d8402c3eab9e27 (diff)
downloadgitlab-ce-fe441cc0d1b32f28b4e5ee048f7aa2f974904c17.tar.gz
Merge branch 'sh-bump-rugged-0.27.4' into 'master'
Bump rugged to 0.27.4 for security fixes See merge request gitlab-org/gitlab-ce!21170
-rw-r--r--Gemfile.lock2
-rw-r--r--changelogs/unreleased/sh-bump-rugged-0-27-4.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index ee8eed07ed7..62c3b28f386 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -810,7 +810,7 @@ GEM
rubyzip (1.2.1)
rufus-scheduler (3.4.0)
et-orbi (~> 1.0)
- rugged (0.27.2)
+ rugged (0.27.4)
safe_yaml (1.0.4)
sanitize (4.6.6)
crass (~> 1.0.2)
diff --git a/changelogs/unreleased/sh-bump-rugged-0-27-4.yml b/changelogs/unreleased/sh-bump-rugged-0-27-4.yml
new file mode 100644
index 00000000000..50373cb81ad
--- /dev/null
+++ b/changelogs/unreleased/sh-bump-rugged-0-27-4.yml
@@ -0,0 +1,5 @@
+---
+title: Bump rugged to 0.27.4 for security fixes
+merge_request:
+author:
+type: security