summaryrefslogtreecommitdiff
path: root/lib/backup/helper.rb
diff options
context:
space:
mode:
authorToon Claes <toon@gitlab.com>2019-02-28 19:57:34 +0100
committerToon Claes <toon@gitlab.com>2019-02-28 19:57:34 +0100
commit62d7990b9bb30cf33ed87017c5c633d1cccc75c2 (patch)
treec3e1b69c58a412ba1c6f50a0337a23d9f9d6e1a4 /lib/backup/helper.rb
parentf6453eca992a9c142268e78ac782cef98110d183 (diff)
downloadgitlab-ce-tc-standard-gem.tar.gz
Ran standardrb --fix on the whole codebasetc-standard-gem
Inspired by https://twitter.com/searls/status/1101137953743613952 I decided to try https://github.com/testdouble/standard on our codebase. It's opinionated, but at least it's a _standard_.
Diffstat (limited to 'lib/backup/helper.rb')
-rw-r--r--lib/backup/helper.rb25
1 files changed, 11 insertions, 14 deletions
diff --git a/lib/backup/helper.rb b/lib/backup/helper.rb
index 22f00aef569..fd3fe1b47f9 100644
--- a/lib/backup/helper.rb
+++ b/lib/backup/helper.rb
@@ -4,13 +4,12 @@ module Backup
module Helper
def access_denied_error(path)
message = <<~EOS
-
- ### NOTICE ###
- As part of restore, the task tried to move existing content from #{path}.
- However, it seems that directory contains files/folders that are not owned
- by the user #{Gitlab.config.gitlab.user}. To proceed, please move the files
- or folders inside #{path} to a secure location so that #{path} is empty and
- run restore task again.
+ ### NOTICE ###
+ As part of restore, the task tried to move existing content from #{path}.
+ However, it seems that directory contains files/folders that are not owned
+ by the user #{Gitlab.config.gitlab.user}. To proceed, please move the files
+ or folders inside #{path} to a secure location so that #{path} is empty and
+ run restore task again.
EOS
raise message
@@ -18,13 +17,11 @@ module Backup
def resource_busy_error(path)
message = <<~EOS
-
- ### NOTICE ###
- As part of restore, the task tried to rename `#{path}` before restoring.
- This could not be completed, perhaps `#{path}` is a mountpoint?
-
- To complete the restore, please move the contents of `#{path}` to a
- different location and run the restore task again.
+ ### NOTICE ###
+ As part of restore, the task tried to rename `#{path}` before restoring.
+ This could not be completed, perhaps `#{path}` is a mountpoint?
+ To complete the restore, please move the contents of `#{path}` to a
+ different location and run the restore task again.
EOS
raise message