summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-11-10 19:16:50 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-11-10 19:16:50 +0800
commit7bacf9464ef18001a0d9504923af8489911496bf (patch)
treeb743741fc31b23266d9f39aa7761a0ff43722389 /changelogs
parent5d4a7cac5f5af6a11216a23651b804c6236995f7 (diff)
parent8fef7a476a7b7c24c7a121d291d6f3b6b0c82f86 (diff)
downloadgitlab-ce-7bacf9464ef18001a0d9504923af8489911496bf.tar.gz
Merge branch '10-1-stable' into 10-1-stable-patch-2
* 10-1-stable: Merge branch '32059-fix-oauth-phishing' into 'master'
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/32059-fix-oauth-phishing.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/32059-fix-oauth-phishing.yml b/changelogs/unreleased/32059-fix-oauth-phishing.yml
new file mode 100644
index 00000000000..1aaa7285309
--- /dev/null
+++ b/changelogs/unreleased/32059-fix-oauth-phishing.yml
@@ -0,0 +1,6 @@
+---
+title: Prevent OAuth phishing attack by presenting detailed wording about app to user
+ during authorization
+merge_request:
+author:
+type: security