diff options
| author | James Lopez <james@jameslopez.es> | 2018-04-09 08:52:19 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2018-04-09 08:52:19 +0200 |
| commit | 88b903c569c8c47433d291c215c43396c297ace8 (patch) | |
| tree | 2395bc1f468be1d35f09661a87ab84b5fe0d4703 /lib/gitlab/import_export/project_tree_restorer.rb | |
| parent | 99ac00b1fdb29e7fec890567ba9bae3dbd8e9061 (diff) | |
| parent | 86ca1a77c58b508fc1b037c5fffbfb22fd992b42 (diff) | |
| download | gitlab-ce-88b903c569c8c47433d291c215c43396c297ace8.tar.gz | |
Merge remote-tracking branch 'origin/master' into 10-7-stable-prepare-rc310-7-stable-prepare-rc3
Diffstat (limited to 'lib/gitlab/import_export/project_tree_restorer.rb')
| -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 2c315207298..d5590dde40f 100644 --- a/lib/gitlab/import_export/project_tree_restorer.rb +++ b/lib/gitlab/import_export/project_tree_restorer.rb @@ -92,7 +92,7 @@ module Gitlab end def override_params - return {} unless params = @project.import_data&.data&.fetch('override_params') + return {} unless params = @project.import_data&.data&.fetch('override_params', nil) @override_params ||= params.select do |key, _value| Project.column_names.include?(key.to_s) && |