summaryrefslogtreecommitdiff
path: root/lib/backup
diff options
context:
space:
mode:
author🙈 jacopo beschi 🙉 <intrip@gmail.com>2018-01-11 16:34:01 +0000
committerRobert Speicher <robert@gitlab.com>2018-01-11 16:34:01 +0000
commit729f05f0e3c4835c91e20ccd1ddb630eb7ef4379 (patch)
tree3d543c84930ce20b7c91d48295bf3e106c788cde /lib/backup
parentca8394e8e4931c85b5f2a2bde1951bcb9419e220 (diff)
downloadgitlab-ce-729f05f0e3c4835c91e20ccd1ddb630eb7ef4379.tar.gz
Adds Rubocop rule for line break around conditionals
Diffstat (limited to 'lib/backup')
-rw-r--r--lib/backup/database.rb1
-rw-r--r--lib/backup/repository.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/backup/database.rb b/lib/backup/database.rb
index d97e5d98229..5e6828de597 100644
--- a/lib/backup/database.rb
+++ b/lib/backup/database.rb
@@ -31,6 +31,7 @@ module Backup
pgsql_args << "-n"
pgsql_args << Gitlab.config.backup.pg_schema
end
+
spawn('pg_dump', *pgsql_args, config['database'], out: compress_wr)
end
compress_wr.close
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index 2a04c03919d..6715159a1aa 100644
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -47,6 +47,7 @@ module Backup
if File.exist?(path_to_wiki_repo)
progress.print " * #{display_repo_path(wiki)} ... "
+
if empty_repo?(wiki)
progress.puts " [SKIPPED]".color(:cyan)
else