Merge branch 'ce-to-ee-2018-10-08' into 'master'

CE upstream - 2018-10-08 09:21 UTC

See merge request gitlab-org/gitlab-ee!7833

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
 

changelogs/unreleased/zj-render-log-artifacts.yml

+---
+title: Render log artifact files in GitLab
+merge_request:
+author:
+type: added

lib/gitlab/ci/templates/Laravel.gitlab-ci.yml

@@ -25,9 +25,12 @@ before_script:
   # Update packages 
   - apt-get update -yqq
   
-  # Upgrade to Node 7
-  - curl -sL https://deb.nodesource.com/setup_7.x | bash -
-  
+  # Prep for Node
+  - apt-get install gnupg -yqq
+
+  # Upgrade to Node 8
+  - curl -sL https://deb.nodesource.com/setup_8.x | bash -
+
   # Install dependencies
   - apt-get install git nodejs libcurl4-gnutls-dev libicu-dev libmcrypt-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libpq-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev -yqq