summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-09-07 18:46:51 -0500
committerJose Ivan Vargas <jvargas@gitlab.com>2017-09-07 18:46:51 -0500
commit00976ff53eafd9ef655732034ec5371503ff5342 (patch)
tree640ed87d3a503d0c622dec227d91ca0ba0454923
parentfbffc274b5df7e79222aeaf55bf5b3b9a466f4cc (diff)
parent7a49d1990adc5a26eba953dc973c62e05417b84f (diff)
downloadgitlab-ce-00976ff53eafd9ef655732034ec5371503ff5342.tar.gz
Merge remote-tracking branch 'com-ce/9-5-stable' into 9-5-stable
-rw-r--r--changelogs/unreleased/fix-gem-security-updates.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/fix-gem-security-updates.yml b/changelogs/unreleased/fix-gem-security-updates.yml
new file mode 100644
index 00000000000..dce11d08402
--- /dev/null
+++ b/changelogs/unreleased/fix-gem-security-updates.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade mail and nokogiri gems due to security issues
+merge_request: 13662
+author: Markus Koller
+type: security