diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-03-21 07:21:01 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-03-21 07:21:01 +0000 |
| commit | f592cae12992f86d711973a82296abfd7bf05bc4 (patch) | |
| tree | 67d61337763428013489b0a260d78044cb379dcb /lib | |
| parent | 977f6e379683d096aa5ae2db15330f35c3796dd2 (diff) | |
| parent | 4e1cebabc7906f46cfab15602a5b9ae15448598d (diff) | |
| download | gitlab-ce-f592cae12992f86d711973a82296abfd7bf05bc4.tar.gz | |
Merge branch 'sh-fix-admin-application-settings' into 'master'
Fix Error 500 when application settings are saved
Closes #29674 and #29115
See merge request !10070
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/visibility_level.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/visibility_level.rb b/lib/gitlab/visibility_level.rb index 2248763c106..8f1d1fdc02e 100644 --- a/lib/gitlab/visibility_level.rb +++ b/lib/gitlab/visibility_level.rb @@ -96,8 +96,8 @@ module Gitlab end def level_value(level) - return string_options[level] if level.is_a? String - level + return level.to_i if level.to_i.to_s == level.to_s && string_options.key(level.to_i) + string_options[level] || PRIVATE end def string_level(level) |