summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-08-15 12:01:34 +0000
committerStan Hu <stanhu@gmail.com>2019-08-15 12:01:34 +0000
commit36a729f05f1b9c2b3935b9d121b8fe3172ce5cc1 (patch)
treeae07698ca456be7a83c3267bf54909594ff2283f /changelogs
parent2c71a94744eba516d10725302ce7ffeb5d4625ab (diff)
parent2857a40950d23173e4280513a5f318b89d1d0a11 (diff)
downloadgitlab-ce-36a729f05f1b9c2b3935b9d121b8fe3172ce5cc1.tar.gz
Merge branch 'georgekoltsov/48854-fix-empty-flash-message' into 'master'ce-update-ff-permissions-for-new-strategies
Exclude json content type from workhorse interception See merge request gitlab-org/gitlab-ce!31809
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/georgekoltsov-48854-fix-empty-flash-message.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/georgekoltsov-48854-fix-empty-flash-message.yml b/changelogs/unreleased/georgekoltsov-48854-fix-empty-flash-message.yml
new file mode 100644
index 00000000000..e28dbd6f0c4
--- /dev/null
+++ b/changelogs/unreleased/georgekoltsov-48854-fix-empty-flash-message.yml
@@ -0,0 +1,6 @@
+---
+title: Fix empty error flash message on profile:account page when updating username
+ with username that has already been taken
+merge_request: 31809
+author:
+type: fixed