Commit 2a000b70 authored by GitLab Bot's avatar GitLab Bot

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-12

# Conflicts:
#	doc/ci/examples/deployment/composer-npm-deploy.md
#	doc/development/documentation/styleguide.md

[ci skip]
parents 27e9dbdf 7bcd65cd
......@@ -43,7 +43,11 @@ All these operations will put all files into a `build` folder, which is ready to
You have multiple options: rsync, scp, sftp and so on. For now, we will use scp.
<<<<<<< HEAD
To make this work, you need to add a GitLab CI/CD variable, by navigating to your project's **Settings > CI/CD** and expanding **Variables**. That variable will be called `STAGING_PRIVATE_KEY` and it's the **private** ssh key of your server.
=======
To make this work, you need to add a GitLab CI/CD Variable (accessible on _gitlab.example/your-project-name/variables_). That variable will be called `STAGING_PRIVATE_KEY` and it's the **private** ssh key of your server.
>>>>>>> upstream/master
### Security tip
......
......@@ -409,7 +409,11 @@ You can use the following fake tokens as examples.
| Personal access token | `n671WNGecHugsdEDPsyo` |
| Application ID | `2fcb195768c39e9a94cec2c2e32c59c0aad7a3365c10892e8116b5d83d4096b6` |
| Application secret | `04f294d1eaca42b8692017b426d53bbc8fe75f827734f0260710b83a556082df` |
<<<<<<< HEAD
| CI/CD variable | `Li8j-mLUVA3eZYjPfd_H` |
=======
| CI/CD variable | `Li8j-mLUVA3eZYjPfd_H` |
>>>>>>> upstream/master
| Specific Runner token | `yrnZW46BrtBFqM7xDzE7dddd` |
| Shared Runner token | `6Vk7ZsosqQyfreAxXTZr` |
| Trigger token | `be20d8dcc028677c931e04f3871a9b` |
......
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