diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-02-02 19:12:55 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-02-02 19:12:55 +0000 |
| commit | cd5d75c362cdf06efb8174eddfbd0f4b65687dec (patch) | |
| tree | bff86f0ffdaa6f2dba310a178da04a0433688506 /lib/gitlab/visibility_level.rb | |
| parent | b89fd7dd5b7e035e2576c0b18ee2670bf57433c2 (diff) | |
| parent | 948150f050d14811f6fe1b327387e3c2c1b1fe31 (diff) | |
| download | gitlab-ce-cd5d75c362cdf06efb8174eddfbd0f4b65687dec.tar.gz | |
Merge branch 'bvl-fix-500-on-fork-without-restricted-visibility-levels' into 'master'
Avoid error when creating forks and restricted levels are defined
Closes #42607
See merge request gitlab-org/gitlab-ce!16881
Diffstat (limited to 'lib/gitlab/visibility_level.rb')
| -rw-r--r-- | lib/gitlab/visibility_level.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/visibility_level.rb b/lib/gitlab/visibility_level.rb index a682de96b3b..2612208a927 100644 --- a/lib/gitlab/visibility_level.rb +++ b/lib/gitlab/visibility_level.rb @@ -59,7 +59,7 @@ module Gitlab def allowed_levels restricted_levels = Gitlab::CurrentSettings.restricted_visibility_levels - self.values - restricted_levels + self.values - Array(restricted_levels) end def closest_allowed_level(target_level) |