diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-21 18:09:29 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-21 18:09:29 +0000 |
commit | 26010cd3206b73b408dd3bc7f10e6858e602e988 (patch) | |
tree | a16264a4628e828e1e82ad2ed6d790445ae5dfea /app/models/blob_viewer | |
parent | af8723415a6ba5017bb56335ae294bcb4934b54b (diff) | |
download | gitlab-ce-26010cd3206b73b408dd3bc7f10e6858e602e988.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/blob_viewer')
-rw-r--r-- | app/models/blob_viewer/dependency_manager.rb | 4 |
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 1be7120a955..a851f22bfcd 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 |