summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <zegerjan@gitlab.com>2018-10-08 08:07:41 +0000
committerKamil TrzciƄski <ayufan@ayufan.eu>2018-10-08 08:07:41 +0000
commit129a60e79dd724228dda711b5789a70412ec7fb4 (patch)
tree5532e315c8d48fb6f6adbb46c87e8ab8b1bdc782
parentc3389c8006443e2b4d994eb15e60bd249fc4732f (diff)
downloadgitlab-ce-129a60e79dd724228dda711b5789a70412ec7fb4.tar.gz
Render log artifact files in GitLab
-rw-r--r--app/models/ci/artifact_blob.rb2
-rw-r--r--changelogs/unreleased/zj-render-log-artifacts.yml5
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