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
6622d775
Commit
6622d775
authored
Jun 14, 2019
by
Mike Greiling
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'leipert-node-12' into 'master'
Update to node@12 See merge request gitlab-org/gitlab-ce!29659
parents
2f44db4c
b7de40f6
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
9 deletions
+9
-9
.gitlab/ci/frontend.gitlab-ci.yml
.gitlab/ci/frontend.gitlab-ci.yml
+1
-1
.gitlab/ci/global.gitlab-ci.yml
.gitlab/ci/global.gitlab-ci.yml
+1
-1
.gitlab/ci/rails.gitlab-ci.yml
.gitlab/ci/rails.gitlab-ci.yml
+2
-2
.nvmrc
.nvmrc
+1
-1
doc/install/installation.md
doc/install/installation.md
+4
-4
No files found.
.gitlab/ci/frontend.gitlab-ci.yml
View file @
6622d775
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
gitlab:assets:compile:
gitlab:assets:compile:
<<
:
*assets-compile-cache
<<
:
*assets-compile-cache
extends
:
.dedicated-no-docs-pull-cache-job
extends
:
.dedicated-no-docs-pull-cache-job
image
:
dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-git-2.21-chrome-73.0-node-
8.x-yarn-1.12
-graphicsmagick-1.3.29-docker-18.06.1
image
:
dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-git-2.21-chrome-73.0-node-
12.x-yarn-1.16
-graphicsmagick-1.3.29-docker-18.06.1
dependencies
:
dependencies
:
-
setup-test-env
-
setup-test-env
services
:
services
:
...
...
.gitlab/ci/global.gitlab-ci.yml
View file @
6622d775
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
-
gitlab-org
-
gitlab-org
.default-cache
:
&default-cache
.default-cache
:
&default-cache
key
:
"
debian-stretch-ruby-2.6.3-node-1
0
.x"
key
:
"
debian-stretch-ruby-2.6.3-node-1
2
.x"
paths
:
paths
:
-
vendor/ruby
-
vendor/ruby
-
.yarn-cache/
-
.yarn-cache/
...
...
.gitlab/ci/rails.gitlab-ci.yml
View file @
6622d775
...
@@ -92,7 +92,7 @@
...
@@ -92,7 +92,7 @@
.rspec-metadata-pg-10
:
&rspec-metadata-pg-10
.rspec-metadata-pg-10
:
&rspec-metadata-pg-10
<<
:
*rspec-metadata
<<
:
*rspec-metadata
<<
:
*use-pg-10
<<
:
*use-pg-10
image
:
"
dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-1
0.x-yarn-1.12
-postgresql-10-graphicsmagick-1.3.29"
image
:
"
dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-1
2.x-yarn-1.16
-postgresql-10-graphicsmagick-1.3.29"
.rspec-metadata-mysql
:
&rspec-metadata-mysql
.rspec-metadata-mysql
:
&rspec-metadata-mysql
<<
:
*rspec-metadata
<<
:
*rspec-metadata
...
@@ -240,7 +240,7 @@ static-analysis:
...
@@ -240,7 +240,7 @@ static-analysis:
script
:
script
:
-
scripts/static-analysis
-
scripts/static-analysis
cache
:
cache
:
key
:
"
debian-stretch-ruby-2.6.3-node-1
0
.x-and-rubocop"
key
:
"
debian-stretch-ruby-2.6.3-node-1
2
.x-and-rubocop"
paths
:
paths
:
-
vendor/ruby
-
vendor/ruby
-
.yarn-cache/
-
.yarn-cache/
...
...
.nvmrc
View file @
6622d775
1
0.13
.0
1
2.4
.0
doc/install/installation.md
View file @
6622d775
...
@@ -263,7 +263,7 @@ Since GitLab 8.17, GitLab requires the use of Node to compile JavaScript
...
@@ -263,7 +263,7 @@ Since GitLab 8.17, GitLab requires the use of Node to compile JavaScript
assets, and Yarn to manage JavaScript dependencies. The current minimum
assets, and Yarn to manage JavaScript dependencies. The current minimum
requirements for these are:
requirements for these are:
-
`node`
>= v8.10.0.
-
`node`
>= v8.10.0.
(We recommend node 12.x as it is faster)
-
`yarn`
>= v1.10.0.
-
`yarn`
>= v1.10.0.
In many distros,
In many distros,
...
@@ -271,8 +271,8 @@ the versions provided by the official package repositories are out of date, so
...
@@ -271,8 +271,8 @@ the versions provided by the official package repositories are out of date, so
we'll need to install through the following commands:
we'll need to install through the following commands:
```
sh
```
sh
# install node v
8
.x
# install node v
12
.x
curl
--location
https://deb.nodesource.com/setup_
8
.x |
sudo
bash -
curl
--location
https://deb.nodesource.com/setup_
12
.x |
sudo
bash -
sudo
apt-get
install
-y
nodejs
sudo
apt-get
install
-y
nodejs
curl
--silent
--show-error
https://dl.yarnpkg.com/debian/pubkey.gpg |
sudo
apt-key add -
curl
--silent
--show-error
https://dl.yarnpkg.com/debian/pubkey.gpg |
sudo
apt-key add -
...
...
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