summaryrefslogtreecommitdiff
path: root/lib/backup/manager.rb
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2015-09-16 11:57:40 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2015-09-16 11:57:40 +0000
commitcccd269da3f5d82c5d14289980d9b52c9cad08db (patch)
tree2947658dfff44a3873f7d350f0353dbdb7b9b541 /lib/backup/manager.rb
parent7d59ba00b9aa1a8be28f1b7ccaa1c628be90aabb (diff)
parentac8d2eb065e9522679d4eae4649c6815daa5460c (diff)
downloadgitlab-ce-cccd269da3f5d82c5d14289980d9b52c9cad08db.tar.gz
Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' into 'master'
Merge CI into CE First step of #2164. - [x] Merge latest CE master - [x] Make application start - [x] Re-use gitlab sessions (remove CI oauth part) - [x] Get rid of gitlab_ci.yml config - [x] Make tests start - [x] Make most CI features works - [x] Make tests green - [x] Write migration documentation - [x] Add CI builds to CE backup See merge request !1204
Diffstat (limited to 'lib/backup/manager.rb')
-rw-r--r--lib/backup/manager.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index 13c68d9354f..ac63f89c6ec 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -153,7 +153,7 @@ module Backup
end
def folders_to_backup
- folders = %w{repositories db uploads}
+ folders = %w{repositories db uploads builds}
if ENV["SKIP"]
return folders.reject{ |folder| ENV["SKIP"].include?(folder) }