diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-10-08 08:07:41 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-10-08 08:07:41 +0000 |
| commit | b86631a5213ca0c950d51aa5362c8d752296e8d7 (patch) | |
| tree | 5532e315c8d48fb6f6adbb46c87e8ab8b1bdc782 | |
| parent | c3389c8006443e2b4d994eb15e60bd249fc4732f (diff) | |
| parent | 129a60e79dd724228dda711b5789a70412ec7fb4 (diff) | |
| download | gitlab-ce-b86631a5213ca0c950d51aa5362c8d752296e8d7.tar.gz | |
Merge branch 'zj-render-log-artifacts' into 'master'
Render log artifact files in GitLab
See merge request gitlab-org/gitlab-ce!22112
| -rw-r--r-- | app/models/ci/artifact_blob.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/zj-render-log-artifacts.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/models/ci/artifact_blob.rb b/app/models/ci/artifact_blob.rb index cd0b31482d2..d87d6a5cb2f 100644 --- a/app/models/ci/artifact_blob.rb +++ b/app/models/ci/artifact_blob.rb @@ -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 diff --git a/changelogs/unreleased/zj-render-log-artifacts.yml b/changelogs/unreleased/zj-render-log-artifacts.yml new file mode 100644 index 00000000000..82f29b62300 --- /dev/null +++ b/changelogs/unreleased/zj-render-log-artifacts.yml @@ -0,0 +1,5 @@ +--- +title: Render log artifact files in GitLab +merge_request: +author: +type: added |