Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-02 15:10:35 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-02 15:10:35 +0300
commit4fa04f789e6fed5f0dfeafe718eeb7f56a5086e9 (patch)
tree5ef2d1d8232d3bd359ec79bf95c9a35ce650ae0b /app/models/blob_viewer
parent4b9ace6c1fead1b44f173eaee0cfaa58f46a258a (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/blob_viewer')
-rw-r--r--app/models/blob_viewer/dependency_manager.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/blob_viewer/dependency_manager.rb b/app/models/blob_viewer/dependency_manager.rb
index a851f22bfcd..1be7120a955 100644
--- a/app/models/blob_viewer/dependency_manager.rb
+++ b/app/models/blob_viewer/dependency_manager.rb
@@ -33,8 +33,8 @@ module BlobViewer
@json_data ||= begin
prepare!
Gitlab::Json.parse(blob.data)
- rescue
- {}
+ rescue
+ {}
end
end