Commit 647e3164 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'ac/lfs-direct-upload-ee-to-ce-ee' into 'master'

Port LFS direct_upload from EE to CE

See merge request gitlab-org/gitlab-ee!5122
parents 6819a07f 51355ed2
...@@ -121,7 +121,7 @@ gem 'carrierwave', '~> 1.2' ...@@ -121,7 +121,7 @@ gem 'carrierwave', '~> 1.2'
gem 'dropzonejs-rails', '~> 0.7.1' gem 'dropzonejs-rails', '~> 0.7.1'
# for backups # for backups
gem 'fog-aws', '~> 2.0' gem 'fog-aws', '~> 2.0.1'
gem 'fog-core', '~> 1.44' gem 'fog-core', '~> 1.44'
gem 'fog-google', '~> 1.3.3' gem 'fog-google', '~> 1.3.3'
gem 'fog-local', '~> 0.3' gem 'fog-local', '~> 0.3'
......
...@@ -1082,7 +1082,7 @@ DEPENDENCIES ...@@ -1082,7 +1082,7 @@ DEPENDENCIES
flipper-active_record (~> 0.13.0) flipper-active_record (~> 0.13.0)
flipper-active_support_cache_store (~> 0.13.0) flipper-active_support_cache_store (~> 0.13.0)
fog-aliyun (~> 0.2.0) fog-aliyun (~> 0.2.0)
fog-aws (~> 2.0) fog-aws (~> 2.0.1)
fog-core (~> 1.44) fog-core (~> 1.44)
fog-google (~> 1.3.3) fog-google (~> 1.3.3)
fog-local (~> 0.3) fog-local (~> 0.3)
......
---
title: Port direct upload of LFS artifacts from EE
merge_request: 17752
author:
type: added
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment