Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
111613a3
Commit
111613a3
authored
Oct 08, 2018
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-08
parents
8e7f2b0a
7f8025e1
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
234 additions
and
189 deletions
+234
-189
app/models/ci/artifact_blob.rb
app/models/ci/artifact_blob.rb
+1
-1
changelogs/unreleased/zj-render-log-artifacts.yml
changelogs/unreleased/zj-render-log-artifacts.yml
+5
-0
lib/gitlab/ci/templates/Laravel.gitlab-ci.yml
lib/gitlab/ci/templates/Laravel.gitlab-ci.yml
+6
-3
vendor/licenses.csv
vendor/licenses.csv
+222
-185
No files found.
app/models/ci/artifact_blob.rb
View file @
111613a3
...
...
@@ -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
0 → 100644
View file @
111613a3
---
title
:
Render log artifact files in GitLab
merge_request
:
author
:
type
:
added
lib/gitlab/ci/templates/Laravel.gitlab-ci.yml
View file @
111613a3
...
...
@@ -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
...
...
vendor/licenses.csv
View file @
111613a3
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment