kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'zj-render-log-artifacts' into 'master' 

Render log artifact files in GitLab

See merge request gitlab-org/gitlab-ce!22112
This commit is contained in:
Kamil Trzciński 2018-10-08 08:07:41 +00:00
parent c3389c8006 129a60e79d
commit b86631a521
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/ci/artifact_blob.rb
View File

@ -4,7 +4,7 @@ module Ci
class ArtifactBlob
include BlobLike
EXTENSIONS_SERVED_BY_PAGES = %w[.html .htm .txt .json].freeze
EXTENSIONS_SERVED_BY_PAGES = %w[.html .htm .txt .json .log].freeze
attr_reader :entry

5
changelogs/unreleased/zj-render-log-artifacts.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Render log artifact files in GitLab
merge_request:
author:
type: added