summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-08-13 19:48:14 +0000
committerJose Vargas <jvargas@gitlab.com>2018-08-17 13:03:28 -0500
commit287fe6256adbda732babc8ecbac0e1dacbf03a3a (patch)
tree05666e702effd405a397d23cde22318b4680e9ba
parent5f956ee9705bc4be9c200e2d7ebfa3e6a28d8e0e (diff)
downloadgitlab-ce-11-2-stable-prepare-rc9.tar.gz
Merge branch 'sh-bump-rugged-0.27.4' into 'master'11-2-stable-prepare-rc9
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 6328110197c..2a7b1345ae1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -811,7 +811,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