Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2019-10-31 03:06:45 +00:00
parent fd0691c6c0
commit 56d78c7028
2 changed files with 9 additions and 0 deletions

View File

@ -123,3 +123,10 @@ they are written:
```bash
kubectl logs <pod_name> --follow -n gitlab-managed-apps
```
## GitLab Managed Apps
GitLab provides [GitLab Managed Apps](../user/clusters/applications.html), a one-click install for various applications which can be added directly to your configured cluster.
**<i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
For an overview of how to add a new GitLab-mananged app, see [How to add GitLab-managed-apps to Kubernetes integration](https://youtu.be/mKm-jkranEk).**

View File

@ -725,6 +725,8 @@ or a `.buildpacks` file in your project:
CAUTION: **Caution:**
Using multiple buildpacks isn't yet supported by Auto DevOps.
CAUTION: **Caution:** When using the `.buildpacks` file, Auto Test will not work. The buildpack [heroku-buildpack-multi](https://github.com/heroku/heroku-buildpack-multi/) (which is used under the hood to parse the `.buildpacks` file) doesn't provide the necessary commands `bin/test-compile` and `bin/test`. Make sure to provide the project variable `BUILDPACK_URL` instead.
### Custom `Dockerfile`
If your project has a `Dockerfile` in the root of the project repo, Auto DevOps