diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-05-23 06:27:46 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-05-23 06:27:46 +0000 |
| commit | 53ad33e4ba1b079e4f2aebceb42a7301c5ce2e4a (patch) | |
| tree | f429da4a18855f715c7aa176fe0edc216d936f50 | |
| parent | c135a69a877c6b3336dc4d25c2bfc2715abbe838 (diff) | |
| parent | a006ff74c78b88cbf6c7a1ee9122a0528a0e844d (diff) | |
| download | gitlab-ce-53ad33e4ba1b079e4f2aebceb42a7301c5ce2e4a.tar.gz | |
Merge branch 'fix/application-settings-error-default-value' into 'master'
Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources
## What does this MR do?
When upgrading to GitLab 8.8, an admin would encounter an Error 500 due to a `nil` `disabled_oauth_sign_in_sources`. This MR ensures that the value will be a blank array if empty.
Closes #17564
See merge request !4242
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | app/models/application_setting.rb | 2 |
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 |