summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2018-07-26 18:30:50 -0300
committerFelipe Artur <felipefac@gmail.com>2018-07-26 18:30:50 -0300
commit13ea4b387ddcee5f5e8a59ac90dc9e485f4242f5 (patch)
treeea588d7aecbaa8868f23addf50748a14d167e342 /changelogs
parentcaeb4597a5b24e0eaa96b24901ce9208c2eef4bf (diff)
parent45c94aba1b90dbe86c5583c8782cc3f624249fa1 (diff)
downloadgitlab-ce-13ea4b387ddcee5f5e8a59ac90dc9e485f4242f5.tar.gz
Merge remote-tracking branch 'dev/master'
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/48617-promoting-milestone.yml5
-rw-r--r--changelogs/unreleased/security-fj-missing-csrf-system-hooks.yml5
-rw-r--r--changelogs/unreleased/security-ide-branch-name-xss.yml5
-rw-r--r--changelogs/unreleased/sh-revert-markdown-changes.yml5
4 files changed, 15 insertions, 5 deletions
diff --git a/changelogs/unreleased/48617-promoting-milestone.yml b/changelogs/unreleased/48617-promoting-milestone.yml
new file mode 100644
index 00000000000..7fbc15051cf
--- /dev/null
+++ b/changelogs/unreleased/48617-promoting-milestone.yml
@@ -0,0 +1,5 @@
+---
+title: Escapes milestone and label's names on flash notice when promoting them
+merge_request:
+author:
+type: fixed
diff --git a/changelogs/unreleased/security-fj-missing-csrf-system-hooks.yml b/changelogs/unreleased/security-fj-missing-csrf-system-hooks.yml
new file mode 100644
index 00000000000..fabf48acbbc
--- /dev/null
+++ b/changelogs/unreleased/security-fj-missing-csrf-system-hooks.yml
@@ -0,0 +1,5 @@
+---
+title: Adding CSRF protection to Hooks test action
+merge_request:
+author:
+type: security
diff --git a/changelogs/unreleased/security-ide-branch-name-xss.yml b/changelogs/unreleased/security-ide-branch-name-xss.yml
new file mode 100644
index 00000000000..51742ffa4e9
--- /dev/null
+++ b/changelogs/unreleased/security-ide-branch-name-xss.yml
@@ -0,0 +1,5 @@
+---
+title: Fixed XSS in branch name in Web IDE
+merge_request:
+author:
+type: security
diff --git a/changelogs/unreleased/sh-revert-markdown-changes.yml b/changelogs/unreleased/sh-revert-markdown-changes.yml
deleted file mode 100644
index 72540f710a1..00000000000
--- a/changelogs/unreleased/sh-revert-markdown-changes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix slow Markdown rendering
-merge_request: 20820
-author:
-type: performance