Commit bb0cf29b authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Fix docs merge conflicts

parent e27dc776
...@@ -1178,7 +1178,6 @@ Note the JSON response differs if the hook is available or not. If the project h ...@@ -1178,7 +1178,6 @@ Note the JSON response differs if the hook is available or not. If the project h
is available before it is returned in the JSON response or an empty response is returned. is available before it is returned in the JSON response or an empty response is returned.
## Admin fork relation ## Admin fork relation
<<<<<<< HEAD
Allows modification of the forked relationship between existing projects. Available only for admins. Allows modification of the forked relationship between existing projects. Available only for admins.
...@@ -1235,17 +1234,14 @@ POST /projects/:id/housekeeping ...@@ -1235,17 +1234,14 @@ POST /projects/:id/housekeeping
| --------- | ---- | -------- | ----------- | | --------- | ---- | -------- | ----------- |
| `id` | integer/string | yes | The ID of the project or NAMESPACE/PROJECT_NAME | | `id` | integer/string | yes | The ID of the project or NAMESPACE/PROJECT_NAME |
## Push Rules (EE only) ## Push Rules
=======
>>>>>>> upstream/master >**Note:**
Available in [GitLab Enterprise Edition Starter](https://about.gitlab.com/gitlab-ee).
### Get project push rules ### Get project push rules
<<<<<<< HEAD Get the push rules of a project.
Get a project push rule.
=======
### Create a forked from/to relation between existing projects
>>>>>>> upstream/master
``` ```
GET /projects/:id/push_rule GET /projects/:id/push_rule
...@@ -1313,22 +1309,17 @@ PUT /projects/:id/push_rule ...@@ -1313,22 +1309,17 @@ PUT /projects/:id/push_rule
### Delete project push rule ### Delete project push rule
<<<<<<< HEAD > Introduced in GitLab 9.0.
Removes a push rule from a project. This is an idempotent method and can be called multiple times. Removes a push rule from a project. This is an idempotent method and can be called multiple times.
Either the push rule is available or not. Either the push rule is available or not.
=======
> Introduced in GitLab 9.0.
>>>>>>> upstream/master
``` ```
DELETE /projects/:id/push_rule DELETE /projects/:id/push_rule
``` ```
<<<<<<< HEAD
=======
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
| --------- | ---- | -------- | ----------- | | --------- | ---- | -------- | ----------- |
>>>>>>> upstream/master
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) |
## Branches ## Branches
......
...@@ -68,90 +68,7 @@ To configure Autodeploy, you will need to: ...@@ -68,90 +68,7 @@ To configure Autodeploy, you will need to:
1. Test your deployment configuration using a [Review App][review-app] that was 1. Test your deployment configuration using a [Review App][review-app] that was
created automatically for you. created automatically for you.
<<<<<<< HEAD
## Using the Kubernetes deploy example project with Nginx
The Autodeploy templates are based on the [kubernetes-deploy][kube-deploy]
project which is used to simplify the deployment process to Kubernetes by
providing intelligent `build`, `deploy` and `destroy` commands which you can
use in your `.gitlab-ci.yml` as-is. It uses Heroku'ish build packs to do some
of the work, plus some of GitLab's own tools to package it all up. For your
convenience, a [Docker image][kube-image] is also provided.
---
A simple example would be the deployment of Nginx on Kubernetes.
Consider a `nginx-deployment.yaml` file in your project with contents:
```yaml
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: __CI_ENVIRONMENT_SLUG__
labels:
app: __CI_ENVIRONMENT_SLUG__
track: stable
spec:
replicas: 3
template:
metadata:
labels:
app: __CI_ENVIRONMENT_SLUG__
track: stable
spec:
containers:
- name: nginx
image: nginx:1.7.9
ports:
- containerPort: 80
```
The important part is where we set up `app: __CI_ENVIRONMENT_SLUG__`. As you'll
see later this is replaced by the [`CI_ENVIRONMENT_SLUG` env variable][variables].
The `.gitlab-ci.yml` would be:
```yaml
image: registry.gitlab.com/gitlab-examples/kubernetes-deploy
stages:
- deploy
kubernetes deploy:
stage: deploy
environment:
name: production
script:
- echo "$KUBE_CA_PEM" > kube_ca.pem
- cat kube_ca.pem
- kubectl config set-cluster default-cluster --server=$KUBE_URL --certificate-authority="$(pwd)/kube_ca.pem"
- kubectl config set-credentials default-admin --token=$KUBE_TOKEN
- kubectl config set-context default-system --cluster=default-cluster --user=default-admin --namespace $KUBE_NAMESPACE
- kubectl config use-context default-system
- sed -i "s/__CI_ENVIRONMENT_SLUG__/$CI_ENVIRONMENT_SLUG/" nginx-deployment.yaml
- cat nginx-deployment.yaml
- kubectl cluster-info
- kubectl get deployments -l app=$CI_ENVIRONMENT_SLUG
- kubectl create -f nginx-deployment.yaml || kubectl replace -f nginx-deployment.yaml
```
Notice that we use a couple of Kubernetes environment variables to configure
the Kubernetes cluster. These are exposed from the
[Kubernetes service](../../user/project/integrations/kubernetes.md#deployment-variables).
The most important one is the `$KUBE_NAMESPACE` which should be unique for
every project.
Next, we replace `__CI_ENVIRONMENT_SLUG__` with the content of the
`CI_ENVIRONMENT_SLUG` variable, so that the `app` label has the correct value.
Finally, the Nginx pod is created from the definition of the
`nginx-deployment.yaml` file.
## Private Project Support
=======
## Private project support ## Private project support
>>>>>>> upstream/master
> Experimental support [introduced][mr-2] in GitLab 9.1. > Experimental support [introduced][mr-2] in GitLab 9.1.
...@@ -174,23 +91,6 @@ The following PostgreSQL variables are supported: ...@@ -174,23 +91,6 @@ The following PostgreSQL variables are supported:
1. `POSTGRES_PASSWORD: "password"`: use custom password for PostgreSQL 1. `POSTGRES_PASSWORD: "password"`: use custom password for PostgreSQL
1. `POSTGRES_DB: "my database"`: use custom database name for PostgreSQL 1. `POSTGRES_DB: "my database"`: use custom database name for PostgreSQL
<<<<<<< HEAD
[mr-8135]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8135
[mr-2]: https://gitlab.com/gitlab-examples/kubernetes-deploy/merge_requests/2
[mr-8]: https://gitlab.com/gitlab-examples/kubernetes-deploy/merge_requests/8
[project-settings]: https://docs.gitlab.com/ce/public_access/public_access.html
[project-services]: ../../user/project/integrations/project_services.md
[auto-deploy-templates]: https://gitlab.com/gitlab-org/gitlab-ci-yml/tree/master/autodeploy
[kubernetes-service]: ../../user/project/integrations/kubernetes.md
[docker-in-docker]: ../docker/using_docker_build.md#use-docker-in-docker-executor
[review-app]: ../review_apps/index.md
[kube-image]: https://gitlab.com/gitlab-examples/kubernetes-deploy/container_registry "Kubernetes deploy Container Registry"
[kube-deploy]: https://gitlab.com/gitlab-examples/kubernetes-deploy "Kubernetes deploy example project"
[container-registry]: https://docs.gitlab.com/ce/user/project/container_registry.html
[postgresql]: https://www.postgresql.org/
=======
>>>>>>> upstream/master
## Auto Monitoring ## Auto Monitoring
> Introduced in [GitLab 9.5](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13438). > Introduced in [GitLab 9.5](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13438).
......
<<<<<<< HEAD
# Auto deploy: quick start guide
=======
# Auto Deploy: quick start guide # Auto Deploy: quick start guide
>>>>>>> upstream/master
This is a step-by-step guide to deploying a project hosted on GitLab.com to Google Cloud, using Auto Deploy. This is a step-by-step guide to deploying a project hosted on GitLab.com to Google Cloud, using Auto Deploy.
...@@ -47,11 +43,7 @@ You need to copy-paste the ca.crt and token into your project on GitLab.com in t ...@@ -47,11 +43,7 @@ You need to copy-paste the ca.crt and token into your project on GitLab.com in t
For API URL, you should use the `Endpoint` IP from your cluster page on Google Cloud Platform. For API URL, you should use the `Endpoint` IP from your cluster page on Google Cloud Platform.
<<<<<<< HEAD
## Expose application to the world
=======
## Expose the application to the internet ## Expose the application to the internet
>>>>>>> upstream/master
In order to be able to visit your application, you need to install an NGINX ingress controller and point your domain name to its external IP address. In order to be able to visit your application, you need to install an NGINX ingress controller and point your domain name to its external IP address.
...@@ -75,11 +67,7 @@ Find out the external IP address of the `ruby-app-nginx-ingress-controller` by r ...@@ -75,11 +67,7 @@ Find out the external IP address of the `ruby-app-nginx-ingress-controller` by r
kubectl get svc ruby-app-nginx-ingress-controller -o jsonpath='{.status.loadBalancer.ingress[0].ip}' kubectl get svc ruby-app-nginx-ingress-controller -o jsonpath='{.status.loadBalancer.ingress[0].ip}'
``` ```
<<<<<<< HEAD
Use this IP address to configure your DNS. This part heavily depends on your preferences and domain provider. But in case you are not sure, just create an A record with a wildcard host like `*.<your-domain>`.
=======
Use this IP address to configure your DNS. This part heavily depends on your preferences and domain provider. But in case you are not sure, just create an A record with a wildcard host like `*.<your-domain>` pointing to the external IP address you found above. Use this IP address to configure your DNS. This part heavily depends on your preferences and domain provider. But in case you are not sure, just create an A record with a wildcard host like `*.<your-domain>` pointing to the external IP address you found above.
>>>>>>> upstream/master
Use `nslookup minimal-ruby-app-staging.<yourdomain>` to confirm that domain is assigned to the cluster IP. Use `nslookup minimal-ruby-app-staging.<yourdomain>` to confirm that domain is assigned to the cluster IP.
...@@ -89,13 +77,6 @@ Visit the home page of your GitLab.com project and press "Set up Auto Deploy" bu ...@@ -89,13 +77,6 @@ Visit the home page of your GitLab.com project and press "Set up Auto Deploy" bu
![auto deploy button](img/auto_deploy_btn.png) ![auto deploy button](img/auto_deploy_btn.png)
<<<<<<< HEAD
You will be redirected to the New file page where you can apply one of the Auto Deploy templates. Select "Kubernetes" to apply the template, then in the file, replace "domain.example.com" with your domain name and any other adjustments you feel comfortable with.
![auto deploy template](img/auto_deploy_dropdown.png)
Change the target branch to `master`, and submit your changes. This should create a new pipeline with several jobs. If you made only the domain name change, the pipeline will have 3 jobs: `build`, `staging` and `production`. The `build` job will create a docker image with your new change and push it to the GitLab Container Registry. The `staging` job will deploy this image on your cluster. Once the deploy job succeeds you should be able to see your application by visiting the Kubernetes dashboard. Select the namespace of your project, which will look like `ruby-autodeploy-23`, but with a unique ID for your project, and your app will be listed as “staging” under the Deployment tab.
=======
You will be redirected to the "New file" page where you can apply one of the Auto Deploy templates. Select "Kubernetes" to apply the template, then in the file, replace `domain.example.com` with your domain name and make any other adjustments you need. You will be redirected to the "New file" page where you can apply one of the Auto Deploy templates. Select "Kubernetes" to apply the template, then in the file, replace `domain.example.com` with your domain name and make any other adjustments you need.
![auto deploy template](img/auto_deploy_dropdown.png) ![auto deploy template](img/auto_deploy_dropdown.png)
...@@ -110,6 +91,5 @@ cluster. Once the deploy job succeeds you should be able to see your application ...@@ -110,6 +91,5 @@ cluster. Once the deploy job succeeds you should be able to see your application
visiting the Kubernetes dashboard. Select the namespace of your project, which visiting the Kubernetes dashboard. Select the namespace of your project, which
will look like `ruby-autodeploy-23`, but with a unique ID for your project, and will look like `ruby-autodeploy-23`, but with a unique ID for your project, and
your app will be listed as "staging" under the "Deployment" tab. your app will be listed as "staging" under the "Deployment" tab.
>>>>>>> upstream/master
Once its ready - just visit http://minimal-ruby-app-staging.yourdomain.com to see “Hello, world!” Once its ready - just visit http://minimal-ruby-app-staging.yourdomain.com to see “Hello, world!”
...@@ -221,7 +221,6 @@ level of members in group. ...@@ -221,7 +221,6 @@ level of members in group.
Member Lock lets a group owner to lock down any new project membership to all the Member Lock lets a group owner to lock down any new project membership to all the
projects within the group, allowing tighter control over project membership. projects within the group, allowing tighter control over project membership.
<<<<<<< HEAD
For instance, if you want to lock the group for an [Audit Event](../../administration/audit_events.md), For instance, if you want to lock the group for an [Audit Event](../../administration/audit_events.md),
you enable Member Lock to guarantee that any membership is added or changed you enable Member Lock to guarantee that any membership is added or changed
during the audition. during the audition.
...@@ -235,8 +234,6 @@ This will disable the option for all users who previously had permissions to ...@@ -235,8 +234,6 @@ This will disable the option for all users who previously had permissions to
operate project memberships so no new users can be added. Furthermore, any operate project memberships so no new users can be added. Furthermore, any
request to add new user to project through API will not be possible. request to add new user to project through API will not be possible.
=======
>>>>>>> upstream/master
### Advanced settings ### Advanced settings
- **Projects**: view all projects within that group, add members to each project, - **Projects**: view all projects within that group, add members to each project,
......
...@@ -55,7 +55,6 @@ changes you made after picking the template and return it to its initial status. ...@@ -55,7 +55,6 @@ changes you made after picking the template and return it to its initial status.
![Description templates](img/description_templates.png) ![Description templates](img/description_templates.png)
<<<<<<< HEAD
## Setting a default template for issues and merge requests ## Setting a default template for issues and merge requests
> >
...@@ -83,11 +82,6 @@ After you add the description, hit **Save changes** for the settings to take ...@@ -83,11 +82,6 @@ After you add the description, hit **Save changes** for the settings to take
effect. Now, every time a new issue or merge request is created, it will be effect. Now, every time a new issue or merge request is created, it will be
pre-filled with the text you entered in the template(s). pre-filled with the text you entered in the template(s).
[ce-4981]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4981
[ee-28]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/28 "Merge Request for adding issues template"
[ee-7478ece]: https://gitlab.com/gitlab-org/gitlab-ee/commit/7478ece8b48e80782b5465b96c79f85cc91d391b "Commit that introduced merge requests templates"
[products]: https://about.gitlab.com/products/
=======
## Description template example ## Description template example
We make use of Description Templates for Issues and Merge Requests within the GitLab Community Edition project. Please refer to the [`.gitlab` folder][gitlab-ce-templates] for some examples. We make use of Description Templates for Issues and Merge Requests within the GitLab Community Edition project. Please refer to the [`.gitlab` folder][gitlab-ce-templates] for some examples.
...@@ -142,5 +136,7 @@ Possible fixes ...@@ -142,5 +136,7 @@ Possible fixes
[ce-4981]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4981 [ce-4981]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4981
[gitlab-ce-templates]: https://gitlab.com/gitlab-org/gitlab-ce/tree/master/.gitlab [gitlab-ce-templates]: https://gitlab.com/gitlab-org/gitlab-ce/tree/master/.gitlab
[ee-28]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/28 "Merge Request for adding issues template"
[ee-7478ece]: https://gitlab.com/gitlab-org/gitlab-ee/commit/7478ece8b48e80782b5465b96c79f85cc91d391b "Commit that introduced merge requests templates"
[products]: https://about.gitlab.com/products/
>>>>>>> upstream/master
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment