diff options
| author | Joshua Welsh <joshua.welsh@performancehorizon.com> | 2016-10-11 10:02:51 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-26 12:54:47 +0200 |
| commit | ce4760bbd57f3b30b0e3845493ed4e39cc463359 (patch) | |
| tree | 81508538e7d045f898a1e45904e9a2fe5d5205bb /CHANGELOG.md | |
| parent | 70074733bb5f8dd09d3389b8873da22c39d52b50 (diff) | |
| download | gitlab-ce-ce4760bbd57f3b30b0e3845493ed4e39cc463359.tar.gz | |
Fixes various errors when adding deploy keys caused by not exiting the control flow.
When adding a deploy key that already exists in the project the existing key would not be returned, resulting in an attempt to create a new one, which in turn caused a 500 error due to an ActiveRecord exception.
When adding a deploy key that exists within another project the key would be joined to the project, but would also attempt to create a new one, which resulted in a 400 error due to the key already existing.
Fixes #22741
Fixes #21754
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5592625efcb..e9c97a1ec66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Fixed link typo on /help/ui to Alerts section. !6915 (Sam Rose) - Simpler arguments passed to named_route on toggle_award_url helper method - Fix: Backup restore doesn't clear cache + - API: Fix project deploy keys 400 and 500 errors when adding an existing key. !6784 (Joshua Welsh) - Replace jquery.cookie plugin with js.cookie !7085 - Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method - Fix Sign in page 'Forgot your password?' link overlaps on medium-large screens |