Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-31

# Conflicts: # CHANGELOG.md [ci skip]

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-31
# Conflicts: # CHANGELOG.md [ci skip]
72ef79b3 · GitLab Bot · cc1cd888 · 37a7b590 · 72ef79b3 · cc1cd888
Commit 72ef79b3 authored May 31, 2018 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

CHANGELOG.md CHANGELOG.md +3 -0

changelogs/unreleased/sh-fix-submit-not-clearing-local-storage.yml ...s/unreleased/sh-fix-submit-not-clearing-local-storage.yml +0 -5

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,11 @@ entry.

 ## 10.8.3 (2018-05-30)

+<<<<<<< HEAD
 - No changes.
 - No changes.
+=======
+>>>>>>> upstream/master
 ### Fixed (4 changes)

 - Replace Gitlab::REVISION with Gitlab.revision and handle installations without a .git directory. !19125

--- a/changelogs/unreleased/sh-fix-submit-not-clearing-local-storage.yml
+++ b/changelogs/unreleased/sh-fix-submit-not-clearing-local-storage.yml
---
-title: Fix local storage not being cleared after creating a new issue
-merge_request:
-author:
-type: fixed