summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2019-08-15 17:27:48 +0000
committerMayra Cabrera <mcabrera@gitlab.com>2019-08-15 17:27:48 +0000
commit23754943a7ec119f123694a93c79fc07c32b7ba5 (patch)
tree5e71c58d4689b0c437f9fdee516ddfa5ee788f95
parentb85cca7a95a8476fb114b5ea4c06bca6f02d60cb (diff)
parente70407d8bce041b2ec7c5f29f0a1a9d895100404 (diff)
downloadgitlab-ce-23754943a7ec119f123694a93c79fc07c32b7ba5.tar.gz
Merge branch 'sh-update-rugged-0.28.3' into 'master'
Upgrade Rugged to 0.28.3.1 See merge request gitlab-org/gitlab-ce!31794
-rw-r--r--Gemfile.lock2
-rw-r--r--changelogs/unreleased/sh-update-rugged-0-28-3.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 16d7f63cb66..fcc0fb64897 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -846,7 +846,7 @@ GEM
rubyntlm (0.6.2)
rubypants (0.2.0)
rubyzip (1.2.2)
- rugged (0.28.2)
+ rugged (0.28.3.1)
safe_yaml (1.0.4)
sanitize (4.6.6)
crass (~> 1.0.2)
diff --git a/changelogs/unreleased/sh-update-rugged-0-28-3.yml b/changelogs/unreleased/sh-update-rugged-0-28-3.yml
new file mode 100644
index 00000000000..86446564e12
--- /dev/null
+++ b/changelogs/unreleased/sh-update-rugged-0-28-3.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade Rugged to 0.28.3
+merge_request: 31794
+author:
+type: security