summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2017-10-17 13:53:42 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2017-10-17 13:53:42 +0000
commit65a1cbc600cf36ff5db9644072e4bf1e2b8e5cde (patch)
tree0354292dccf0debc90d55a00937d4033453603e0 /changelogs
parent526c47618e446bfec776b6e17462298f17fb24ee (diff)
parentc909b6aa6d62a4c556a866166d0a98c952d2ef62 (diff)
downloadgitlab-ce-65a1cbc600cf36ff5db9644072e4bf1e2b8e5cde.tar.gz
Merge branch 'prevent-creating-multiple-application-settings' into 'master'
Prevent creating multiple ApplicationSetting by forcing it to always have id=1 Closes #34728 See merge request gitlab-org/gitlab-ce!14718
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/prevent-creating-multiple-application-settings.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/prevent-creating-multiple-application-settings.yml b/changelogs/unreleased/prevent-creating-multiple-application-settings.yml
new file mode 100644
index 00000000000..fd49028b9e9
--- /dev/null
+++ b/changelogs/unreleased/prevent-creating-multiple-application-settings.yml
@@ -0,0 +1,5 @@
+---
+title: Prevent creating multiple ApplicationSetting instances
+merge_request:
+author:
+type: fixed