summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-02-19 09:09:25 +0000
committerDouwe Maan <douwe@gitlab.com>2018-02-19 09:09:25 +0000
commit586816aece7cf3a96d0f4948d5dbf2a8e2a9a187 (patch)
tree4f6490b96eeb5ebdd6bb4b87a91d01c5c07104d9 /changelogs
parent637ab60c608cd531c1cc8ad130c7606ca2716ba6 (diff)
parentfdad576838c16d0ae7d181e85a5889d8ae4e5014 (diff)
downloadgitlab-ce-586816aece7cf3a96d0f4948d5dbf2a8e2a9a187.tar.gz
Merge branch 'sh-fix-geo-error-500-gpg-commit' into 'master'
Fix Error 500 when viewing a commit with a GPG signature in Geo Closes gitlab-ee#4825 See merge request gitlab-org/gitlab-ce!17207
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/sh-fix-geo-error-500-gpg-commit.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-fix-geo-error-500-gpg-commit.yml b/changelogs/unreleased/sh-fix-geo-error-500-gpg-commit.yml
new file mode 100644
index 00000000000..5b4bbe0dc7a
--- /dev/null
+++ b/changelogs/unreleased/sh-fix-geo-error-500-gpg-commit.yml
@@ -0,0 +1,5 @@
+---
+title: Fix Error 500 when viewing a commit with a GPG signature in Geo
+merge_request:
+author:
+type: fixed