summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-10-05 21:56:23 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2017-10-16 10:19:18 +0200
commitc909b6aa6d62a4c556a866166d0a98c952d2ef62 (patch)
treecacc5c8f07a4a9b23e15e2ba2aa9a80e54ffb0e3
parent2087f121bfedd2f51eb943f23026e823d196466a (diff)
downloadgitlab-ce-c909b6aa6d62a4c556a866166d0a98c952d2ef62.tar.gz
Prevent creating multiple ApplicationSetting by forcing it to always have id=1prevent-creating-multiple-application-settings
-rw-r--r--app/models/application_setting.rb2
-rw-r--r--changelogs/unreleased/prevent-creating-multiple-application-settings.yml5
-rw-r--r--spec/models/application_setting_spec.rb10
3 files changed, 17 insertions, 0 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index c0cc60d5ebf..5b5bb3cbe2c 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -33,6 +33,8 @@ class ApplicationSetting < ActiveRecord::Base
attr_accessor :domain_whitelist_raw, :domain_blacklist_raw
+ default_value_for :id, 1
+
validates :uuid, presence: true
validates :session_expire_delay,
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
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index 78cacf9ff5d..eff84c308b5 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -209,6 +209,16 @@ describe ApplicationSetting do
end
end
+ context 'restrict creating duplicates' do
+ before do
+ described_class.create_from_defaults
+ end
+
+ it 'raises an record creation violation if already created' do
+ expect { described_class.create_from_defaults }.to raise_error(ActiveRecord::RecordNotUnique)
+ end
+ end
+
context 'restricted signup domains' do
it 'sets single domain' do
setting.domain_whitelist_raw = 'example.com'