summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-05-23 06:36:25 +0200
committerStan Hu <stanhu@gmail.com>2016-05-22 22:31:28 -0700
commita006ff74c78b88cbf6c7a1ee9122a0528a0e844d (patch)
treef429da4a18855f715c7aa176fe0edc216d936f50
parentc135a69a877c6b3336dc4d25c2bfc2715abbe838 (diff)
downloadgitlab-ce-fix/application-settings-error-default-value.tar.gz
Serialize application setting as Array by defaultfix/application-settings-error-default-value
-rw-r--r--CHANGELOG3
-rw-r--r--app/models/application_setting.rb2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e5cdcc2ecc3..3e459f8b2ba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
Please view this file on the master branch, on stable branches it's out of date.
+v 8.8.2 (unreleased)
+ - Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources
+
v 8.8.1
- Add documentation for the "Health Check" feature
- Allow anonymous users to access a public project's pipelines
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index f5079f92444..9a14954b4a7 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -7,7 +7,7 @@ class ApplicationSetting < ActiveRecord::Base
serialize :restricted_visibility_levels
serialize :import_sources
- serialize :disabled_oauth_sign_in_sources
+ serialize :disabled_oauth_sign_in_sources, Array
serialize :restricted_signup_domains, Array
attr_accessor :restricted_signup_domains_raw