From d583248458a398fdd61d128651d29c49a156be13 Mon Sep 17 00:00:00 2001
From: Abhijith PA <abhijith@disroot.org>
Date: Sun, 20 Jan 2019 21:56:17 +0530
Subject: [PATCH] merge changelog from master-11.5

---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5c416f6c6e..b5e65fcf8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,14 @@ gitlab (11.6.0+dfsg-1) experimental; urgency=medium
 
  -- Sruthi Chandran <srud@disroot.org>  Sun, 23 Dec 2018 12:16:18 +0530
 
+gitlab (11.5.7+dfsg-1) unstable; urgency=medium
+
+  * New upstream version 11.5.7+dfsg
+  * Fix CVE-2019-6240: Arbitrary repo read in Gitlab project import
+    (Closes: #919822)
+
+ -- Abhijith PA <abhijith@debian.org>  Sun, 20 Jan 2019 21:37:01 +0530
+
 gitlab (11.5.6+dfsg-1) unstable; urgency=high
 
   * New upstream version 11.5.6+dfsg (Closes: #918086) (Fixes: CVE-2018-20488,