diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-29 18:02:32 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-29 18:02:32 +0000 |
| commit | 02299efa4f05761fa76679c0876e97bfef491894 (patch) | |
| tree | f227812d61ce8028b62a803e38ca2655f8a6e526 | |
| parent | c06062758ddfd760c105df0909570d4a98979e40 (diff) | |
| parent | 2c298473a682c567bbeb5dd7debfd767c5a6edcd (diff) | |
| download | gitlab-ce-02299efa4f05761fa76679c0876e97bfef491894.tar.gz | |
Merge branch 'rs-silence-update-pages-service' into 'master'
Perform unzip quietly in UpdatePagesService
Closes gitlab-ee#225
See merge request !12539
| -rw-r--r-- | app/services/projects/update_pages_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/projects/update_pages_service.rb b/app/services/projects/update_pages_service.rb index 17cf71cf098..e60b854f916 100644 --- a/app/services/projects/update_pages_service.rb +++ b/app/services/projects/update_pages_service.rb @@ -93,10 +93,11 @@ module Projects end # Requires UnZip at least 6.00 Info-ZIP. + # -qq be (very) quiet # -n never overwrite existing files # We add * to end of SITE_PATH, because we want to extract SITE_PATH and all subdirectories site_path = File.join(SITE_PATH, '*') - unless system(*%W(unzip -n #{artifacts} #{site_path} -d #{temp_path})) + unless system(*%W(unzip -qq -n #{artifacts} #{site_path} -d #{temp_path})) raise 'pages failed to extract' end end |