diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-05-22 19:40:03 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-05-22 19:40:03 +0000 |
| commit | add00b6986c78497c18a2f48bf83f0a23c7923f8 (patch) | |
| tree | 70b38743e4743ee7cf95247fd75433ddf04114e2 /lib | |
| parent | 5431af8b3d4858ac72e796b42bd252d279e53f50 (diff) | |
| parent | 5c8cd42bbd6a387f5e73c688615c54606810983e (diff) | |
| download | gitlab-ce-add00b6986c78497c18a2f48bf83f0a23c7923f8.tar.gz | |
Merge branch 'sh-project-import-visibility-error' into 'master'
Fix invalid visibility string comparison in project import
Closes #61692
See merge request gitlab-org/gitlab-ce!28612
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/import_export/project_tree_restorer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/project_tree_restorer.rb b/lib/gitlab/import_export/project_tree_restorer.rb index 51001750a6c..20caadb89c0 100644 --- a/lib/gitlab/import_export/project_tree_restorer.rb +++ b/lib/gitlab/import_export/project_tree_restorer.rb @@ -129,7 +129,7 @@ module Gitlab def visibility_level level = override_params['visibility_level'] || json_params['visibility_level'] || @project.visibility_level - level = @project.group.visibility_level if @project.group && level > @project.group.visibility_level + level = @project.group.visibility_level if @project.group && level.to_i > @project.group.visibility_level { 'visibility_level' => level } end |