summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2017-06-07 15:44:58 +0200
committerJames Lopez <james@jameslopez.es>2017-06-07 15:44:58 +0200
commit8f07afe31121f61e71db8b8fc45455066a5453f4 (patch)
treec97b36fd77ddcfa6d44e4510973a59bf491b10a9
parentc085f88fc6a293732cb9f1f96884c0795ff86bd3 (diff)
downloadgitlab-ce-8f07afe31121f61e71db8b8fc45455066a5453f4.tar.gz
fix spec and added changelog
-rw-r--r--changelogs/unreleased/fix-backup-restore-resume.yml4
-rw-r--r--spec/lib/gitlab/backup/repository_spec.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/changelogs/unreleased/fix-backup-restore-resume.yml b/changelogs/unreleased/fix-backup-restore-resume.yml
new file mode 100644
index 00000000000..b7dfd451f5d
--- /dev/null
+++ b/changelogs/unreleased/fix-backup-restore-resume.yml
@@ -0,0 +1,4 @@
+---
+title: Make backup task to continue on corrupt repositories
+merge_request: 11962
+author:
diff --git a/spec/lib/gitlab/backup/repository_spec.rb b/spec/lib/gitlab/backup/repository_spec.rb
index 5399b4ac805..2d62e8c7b47 100644
--- a/spec/lib/gitlab/backup/repository_spec.rb
+++ b/spec/lib/gitlab/backup/repository_spec.rb
@@ -1,8 +1,6 @@
require 'spec_helper'
describe Backup::Repository, lib: true do
- include StubENV
-
let(:progress) { StringIO.new }
let!(:project) { create(:empty_project) }