summaryrefslogtreecommitdiff
path: root/app/models/uploads
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-13 12:07:41 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-13 12:07:41 +0000
commit8cc5f2790908ba9bb8eecba2b78a3c5a88c77b90 (patch)
tree2d6211503a5111d43a9edce0c56b94fd1b347e1b /app/models/uploads
parent17b91a3c6ab73fff087e91665e9afb8046cbf045 (diff)
downloadgitlab-ce-8cc5f2790908ba9bb8eecba2b78a3c5a88c77b90.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/uploads')
-rw-r--r--app/models/uploads/local.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/uploads/local.rb b/app/models/uploads/local.rb
index 2901c33c359..f1f25dfb584 100644
--- a/app/models/uploads/local.rb
+++ b/app/models/uploads/local.rb
@@ -23,7 +23,8 @@ module Uploads
unless in_uploads?(path)
message = "Path '#{path}' is not in uploads dir, skipping"
logger.warn(message)
- Gitlab::Sentry.track_exception(RuntimeError.new(message), extra: { uploads_dir: storage_dir })
+ Gitlab::Sentry.track_and_raise_for_dev_exception(
+ RuntimeError.new(message), uploads_dir: storage_dir)
return
end