diff options
author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-02 16:19:17 -0500 |
---|---|---|
committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-02 16:19:17 -0500 |
commit | b03b31659b0101dc4a5838bec7dca193706661cd (patch) | |
tree | 3bd1004659f85da6d149f89700b7c0e8388f0b31 /app/controllers/projects/lfs_storage_controller.rb | |
parent | 4484587ef8c9bf63c60359a0980dda95e854b744 (diff) | |
download | gitlab-ce-b03b31659b0101dc4a5838bec7dca193706661cd.tar.gz |
fixing some broken merges
Diffstat (limited to 'app/controllers/projects/lfs_storage_controller.rb')
-rw-r--r-- | app/controllers/projects/lfs_storage_controller.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/controllers/projects/lfs_storage_controller.rb b/app/controllers/projects/lfs_storage_controller.rb index 88fc373945a..6b16f1ccbbb 100644 --- a/app/controllers/projects/lfs_storage_controller.rb +++ b/app/controllers/projects/lfs_storage_controller.rb @@ -71,10 +71,7 @@ class Projects::LfsStorageController < Projects::GitHttpClientController end def move_tmp_file_to_storage(object, path) - File.open(path) do |f| - object.file = f - end - + object.file = File.open(path) object.file.store! object.save end |