diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 06:07:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 06:07:58 +0000 |
commit | 9c83aadd2604e7e6cb1f84683f951e6b12872618 (patch) | |
tree | c0a14c87378e832e87580be382e1c8ccea188b71 /doc/user/project | |
parent | 23bc19cb73aad969c9636b8b935111645e809e54 (diff) | |
download | gitlab-ce-9c83aadd2604e7e6cb1f84683f951e6b12872618.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project')
-rw-r--r-- | doc/user/project/clusters/serverless/aws.md | 2 | ||||
-rw-r--r-- | doc/user/project/code_owners.md | 4 | ||||
-rw-r--r-- | doc/user/project/new_ci_build_permissions_model.md | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/user/project/clusters/serverless/aws.md b/doc/user/project/clusters/serverless/aws.md index 4c36c1fa4ed..0f3eea14efc 100644 --- a/doc/user/project/clusters/serverless/aws.md +++ b/doc/user/project/clusters/serverless/aws.md @@ -140,7 +140,7 @@ NOTE: **Note:** In your GitLab deploy stage log, there will be output containing your AWS Lambda endpoint URL. The log line will look similar to this: -``` +```plaintext endpoints: GET - https://u768nzby1j.execute-api.us-east-1.amazonaws.com/production/hello ``` diff --git a/doc/user/project/code_owners.md b/doc/user/project/code_owners.md index 4ab615a1008..49083be77dc 100644 --- a/doc/user/project/code_owners.md +++ b/doc/user/project/code_owners.md @@ -29,7 +29,7 @@ the users from last pattern matching the file are displayed on the blob page of the given file. For example, you have the following `CODEOWNERS` file: -``` +```plaintext README.md @user1 # This line would also match the file README.md @@ -68,7 +68,7 @@ escaped using `\#` to address files for which the name starts with a Example `CODEOWNERS` file: -``` +```plaintext # This is an example code owners file, lines starting with a `#` will # be ignored. diff --git a/doc/user/project/new_ci_build_permissions_model.md b/doc/user/project/new_ci_build_permissions_model.md index 09af6d05690..51ea070f60a 100644 --- a/doc/user/project/new_ci_build_permissions_model.md +++ b/doc/user/project/new_ci_build_permissions_model.md @@ -213,7 +213,7 @@ project for which the job is triggered. This is how an example usage can look like: -``` +```yaml test: script: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY |