Automatic merge of gitlab-org/gitlab-ce master

doc/topics/autodevops/index.md

@@ -315,7 +315,8 @@ If a project's repository contains a `Dockerfile`, Auto Build will use
 
 If you are also using Auto Review Apps and Auto Deploy and choose to provide
 your own `Dockerfile`, make sure you expose your application to port
-`5000` as this is the port assumed by the default Helm chart.
+`5000` as this is the port assumed by the
+[default Helm chart](https://gitlab.com/gitlab-org/charts/auto-deploy-app).
 
 #### Auto Build using Heroku buildpacks
 

doc/user/application_security/license_management/index.md

@@ -44,14 +44,14 @@ library whose license is incompatible with yours.
 
 The following languages and package managers are supported.
 
-| Language   | Package managers                                                  |
-|------------|-------------------------------------------------------------------|
-| JavaScript | [Bower](https://bower.io/), [npm](https://www.npmjs.com/)         |
-| Go         | [Godep](https://github.com/tools/godep), go get                   |
-| Java       | [Gradle](https://gradle.org/), [Maven](https://maven.apache.org/) |
-| .NET       | [Nuget](https://www.nuget.org/)                                   |
-| Python     | [pip](https://pip.pypa.io/en/stable/)                             |
-| Ruby       | [gem](https://rubygems.org/)                                      |
+| Language   | Package managers                                                  | Scan Tool                                                |
+|------------|-------------------------------------------------------------------|----------------------------------------------------------|
+| JavaScript | [Bower](https://bower.io/), [npm](https://www.npmjs.com/)         |[License Finder](https://github.com/pivotal/LicenseFinder)|
+| Go         | [Godep](https://github.com/tools/godep), go get                   |[License Finder](https://github.com/pivotal/LicenseFinder)|
+| Java       | [Gradle](https://gradle.org/), [Maven](https://maven.apache.org/) |[License Finder](https://github.com/pivotal/LicenseFinder)|
+| .NET       | [Nuget](https://www.nuget.org/)                                   |[License Finder](https://github.com/pivotal/LicenseFinder)|
+| Python     | [pip](https://pip.pypa.io/en/stable/)                             |[License Finder](https://github.com/pivotal/LicenseFinder)|
+| Ruby       | [gem](https://rubygems.org/)                                      |[License Finder](https://github.com/pivotal/LicenseFinder)|
 
 ## Requirements
 

doc/user/permissions.md

@@ -17,7 +17,10 @@ will be unassigned automatically.
 GitLab [administrators](../administration/index.md) receive all permissions.
 
 To add or import a user, you can follow the
-[project members documentation](../user/project/members/index.md).
+[project members documentation](project/members/index.md).
+
+For information on eligible approvers for Merge Requests, see
+[Eligible approvers](project/merge_requests/merge_request_approvals.md#eligible-approvers).
 
 ## Principles behind permissions
 

package.json

@@ -147,7 +147,7 @@
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.2.0",
     "@gitlab/eslint-config": "^1.6.0",
-    "@gitlab/eslint-plugin-i18n": "^1.0.0",
+    "@gitlab/eslint-plugin-i18n": "^1.1.0",
     "@vue/test-utils": "^1.0.0-beta.25",
     "axios-mock-adapter": "^1.15.0",
     "babel-jest": "^24.1.0",

yarn.lock

@@ -693,7 +693,7 @@
     eslint-plugin-promise "^4.1.1"
     eslint-plugin-vue "^5.0.0"
 
-"@gitlab/eslint-plugin-i18n@^1.0.0":
+"@gitlab/eslint-plugin-i18n@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin-i18n/-/eslint-plugin-i18n-1.1.0.tgz#e494d599e644ce3a094ea85f87dbbda41a924c5e"
   integrity sha512-Cwm7sLtQnUDqvxE9Ez8UMslyosPCpMVLxBnFb+2n6QcBZmXRao4aNSVRkmlsDZYgYegWhOGn3Qq3MLy4BSqauQ==