summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-09-07 20:20:42 -0400
committerRobert Speicher <rspeicher@gmail.com>2017-09-07 20:20:42 -0400
commitb39d0c318921bae2e3a11df9ee6828291dad9864 (patch)
tree197d14cbafbe1ccd67500d7b206671065347d18b /changelogs
parent293cbdc99721ab7ea7b8fdc76e5223554c495d0f (diff)
parentb373c56c7b2898fc0cac16a26a41c7019ab7ca3e (diff)
downloadgitlab-ce-b39d0c318921bae2e3a11df9ee6828291dad9864.tar.gz
Merge remote-tracking branch 'dev/master'
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/fix-gem-security-updates.yml5
1 files changed, 0 insertions, 5 deletions
diff --git a/changelogs/unreleased/fix-gem-security-updates.yml b/changelogs/unreleased/fix-gem-security-updates.yml
deleted file mode 100644
index dce11d08402..00000000000
--- a/changelogs/unreleased/fix-gem-security-updates.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade mail and nokogiri gems due to security issues
-merge_request: 13662
-author: Markus Koller
-type: security