diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-08-31 16:11:36 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-08-31 16:11:36 +0300 |
| commit | 472f2d566633df6c1dee1f703b06958b9a0a2cd8 (patch) | |
| tree | d1cd43bb01dc89f772ea9ec622e6edffd8f45f67 /lib/gitlab/import_export | |
| parent | 74c53ef6e64299fb6b2030094725a9c0265421f4 (diff) | |
| parent | 6dfab422368f54aff5f976c65e860332236bbf5c (diff) | |
Merge branch '47765-group-visibility-error-due-to-string-conversion' into 'master'
Changes update_column to update_attributes in ProjectTreeRestorer#restore_project by using timeless to maintain the current timestamps
Closes #47765
See merge request gitlab-org/gitlab-ce!21242
Diffstat (limited to 'lib/gitlab/import_export')
| -rw-r--r-- | lib/gitlab/import_export/project_tree_restorer.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/project_tree_restorer.rb b/lib/gitlab/import_export/project_tree_restorer.rb index 76b99b1de16..f4106e03a57 100644 --- a/lib/gitlab/import_export/project_tree_restorer.rb +++ b/lib/gitlab/import_export/project_tree_restorer.rb @@ -94,7 +94,10 @@ module Gitlab end def restore_project - @project.update_columns(project_params) + Gitlab::Timeless.timeless(@project) do + @project.update(project_params) + end + @project end |