diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 21:07:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 21:07:43 +0000 |
| commit | 015663b70f1bcdae4483e38c2beac884f92da5b8 (patch) | |
| tree | 6dd5a59c7f9a27c3cca22801ca30bf3dd8f9b401 /app/helpers/application_helper.rb | |
| parent | 5eb11b697d7ee280b0b5c2ff9a1850a3b5e9b7e3 (diff) | |
| download | gitlab-ce-015663b70f1bcdae4483e38c2beac884f92da5b8.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/application_helper.rb')
| -rw-r--r-- | app/helpers/application_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8389272fd35..8833b36c42d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -198,7 +198,7 @@ module ApplicationHelper end def external_storage_url_or_path(path, project = @project) - return path unless static_objects_external_storage_enabled? + return path if @snippet || !static_objects_external_storage_enabled? uri = URI(Gitlab::CurrentSettings.static_objects_external_storage_url) path = URI(path) # `path` could have query parameters, so we need to split query and path apart |