summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-05-02 07:55:43 +0000
committerDouwe Maan <douwe@gitlab.com>2018-05-02 07:55:43 +0000
commit9ba9c3c8333311be79e3ca45a43da5e49423e669 (patch)
tree9b7bafe9601ab20d4b16fe6ddc028233a84fc740 /app/controllers
parent83e0395190bd189e68ae51bdc7c5c76e81f99bab (diff)
parent9bb7abedf57f5325a92bebc2d93b85cf7e1fc303 (diff)
downloadgitlab-ce-9ba9c3c8333311be79e3ca45a43da5e49423e669.tar.gz
Merge branch 'make-job-lfs-artifacts-read-only' into 'master'
Fix file_store for artifacts and lfs when saving See merge request gitlab-org/gitlab-ce!18624
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/lfs_storage_controller.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/projects/lfs_storage_controller.rb b/app/controllers/projects/lfs_storage_controller.rb
index ebde0df1f7b..43d8867a536 100644
--- a/app/controllers/projects/lfs_storage_controller.rb
+++ b/app/controllers/projects/lfs_storage_controller.rb
@@ -77,8 +77,7 @@ class Projects::LfsStorageController < Projects::GitHttpClientController
def link_to_project!(object)
if object && !object.projects.exists?(storage_project.id)
- object.projects << storage_project
- object.save!
+ object.lfs_objects_projects.create!(project: storage_project)
end
end
end