From 1ca825974af8aa6f48963d74b7aef241bd8efa83 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sat, 3 Oct 2020 21:28:07 -0700
Subject: [PATCH] Fix large backups not working with Azure Blob storage
This commit bumps the gitlab-fog-azure-rm gem version to v1.0, which
fixes an issue when backups exceed 33 MB in size:
https://gitlab.com/gitlab-org/gitlab-fog-azure-rm/-/merge_requests/19
---
Gemfile | 2 +-
Gemfile.lock | 4 ++--
changelogs/unreleased/sh-update-fog-azure-rm-gem.yml | 5 +++++
3 files changed, 8 insertions(+), 3 deletions(-)
create mode 100644 changelogs/unreleased/sh-update-fog-azure-rm-gem.yml
diff --git a/Gemfile b/Gemfile
index 57853f9f3b5f..77941618f58e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -120,7 +120,7 @@ gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.3'
-gem 'gitlab-fog-azure-rm', '~> 0.9', require: false
+gem 'gitlab-fog-azure-rm', '~> 1.0', require: false
# for Google storage
gem 'google-api-client', '~> 0.33'
diff --git a/Gemfile.lock b/Gemfile.lock
index 142a606faa06..fb59edb3505c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -421,7 +421,7 @@ GEM
github-markup (1.7.0)
gitlab-chronic (0.10.5)
numerizer (~> 0.2)
- gitlab-fog-azure-rm (0.9.0)
+ gitlab-fog-azure-rm (1.0.0)
azure-storage-blob (~> 2.0)
azure-storage-common (~> 2.0)
fog-core (= 2.1.0)
@@ -1323,7 +1323,7 @@ DEPENDENCIES
gitaly (~> 13.3.0.pre.rc1)
github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5)
- gitlab-fog-azure-rm (~> 0.9)
+ gitlab-fog-azure-rm (~> 1.0)
gitlab-labkit (= 0.12.1)
gitlab-license (~> 1.0)
gitlab-mail_room (~> 0.0.6)
diff --git a/changelogs/unreleased/sh-update-fog-azure-rm-gem.yml b/changelogs/unreleased/sh-update-fog-azure-rm-gem.yml
new file mode 100644
index 000000000000..25d143a011b3
--- /dev/null
+++ b/changelogs/unreleased/sh-update-fog-azure-rm-gem.yml
@@ -0,0 +1,5 @@
+---
+title: Fix large backups not working with Azure Blob storage
+merge_request: 44233
+author:
+type: fixed
--
GitLab