From 91cca6e4943dd64d3bfe029e3da275ed1113bf47 Mon Sep 17 00:00:00 2001 From: Mark Fletcher Date: Fri, 25 Aug 2017 11:01:01 +0700 Subject: Add a Build Variable to represent the triggering GitLab user's name * Predefined variable represents the name of the GitLab user that started a build --- doc/ci/variables/README.md | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'doc/ci') diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md index 22e7f6879ed..4b48a1f1c51 100644 --- a/doc/ci/variables/README.md +++ b/doc/ci/variables/README.md @@ -77,6 +77,12 @@ 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_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 -- cgit v1.2.1 From 22d5cca8a7afe69000faac6e9011f6662f610123 Mon Sep 17 00:00:00 2001 From: Mark Fletcher Date: Fri, 25 Aug 2017 11:01:55 +0700 Subject: 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 --- doc/ci/variables/README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'doc/ci') 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 -- cgit v1.2.1