summaryrefslogtreecommitdiff
path: root/doc/ci
diff options
context:
space:
mode:
authorMark Fletcher <mark@gitlab.com>2017-08-25 11:01:55 +0700
committerMark Fletcher <mark@gitlab.com>2017-08-30 11:25:30 +0800
commit22d5cca8a7afe69000faac6e9011f6662f610123 (patch)
tree4c4d20bdc5030da9638d0d710f3d74117f26d2f3 /doc/ci
parent91cca6e4943dd64d3bfe029e3da275ed1113bf47 (diff)
downloadgitlab-ce-22d5cca8a7afe69000faac6e9011f6662f610123.tar.gz
Add a Build Variable to represent the triggering GitLab user's login username
* Predefined variable represents the username of the GitLab user that started a build
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/variables/README.md6
1 files changed, 1 insertions, 5 deletions
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index 4b48a1f1c51..2b189c80066 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -77,12 +77,8 @@ future GitLab releases.**
| **GITLAB_CI** | all | all | Mark that job is executed in GitLab CI environment |
| **GITLAB_USER_ID** | 8.12 | all | The id of the user who started the job |
| **GITLAB_USER_EMAIL** | 8.12 | all | The email of the user who started the job |
-<<<<<<< HEAD
-| **GITLAB_USER_NAME** | 10.0 | all | The name of the user who started the job |
-=======
-| **GITLAB_USER_USERNAME** | 10.0 | all | The username of the user who started the job |
+| **GITLAB_USER_LOGIN** | 10.0 | all | The login username of the user who started the job |
| **GITLAB_USER_NAME** | 10.0 | all | The real name of the user who started the job |
->>>>>>> 940c584882... fixup name
| **RESTORE_CACHE_ATTEMPTS** | 8.15 | 1.9 | Number of attempts to restore the cache running a job |
## 9.0 Renaming