diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-05-23 06:27:46 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-05-25 11:42:23 +0200 |
| commit | 8a494ecd4288b93528b633f881a066a525c16825 (patch) | |
| tree | 43607646efd58fcbb648c357e8d997d7dfba3d5c | |
| parent | b24d2b46a31535d900c02571461fecb19f473072 (diff) | |
| download | gitlab-ce-8a494ecd4288b93528b633f881a066a525c16825.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 | 2 | ||||
| -rw-r--r-- | app/models/application_setting.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 0f1a68c4414..45de8388153 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,8 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.8.2 - Added remove due date button. !4209 - Fix access to Pipelines by Anonymous user. !4233 +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 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 |