kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add a Build Variable to represent the triggering GitLab user's name

Browse source 
* Predefined variable represents the name of the GitLab user that started a build
This commit is contained in:
Mark Fletcher 2017-08-25 11:01:01 +07:00
parent 19dfd9e9d6
commit 91cca6e494
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/models/ci/build.rb
View file

@ -384,7 +384,8 @@ module Ci
[ [
{ key: 'GITLAB_USER_ID', value: user.id.to_s, public: true }, { key: 'GITLAB_USER_ID', value: user.id.to_s, public: true },
{ key: 'GITLAB_USER_EMAIL', value: user.email, public: true } { key: 'GITLAB_USER_EMAIL', value: user.email, public: true },
{ key: 'GITLAB_USER_NAME', value: user.name, public: true }
] ]
end end

6
doc/ci/variables/README.md
View file

@ -77,6 +77,12 @@ future GitLab releases.**
| **GITLAB_CI** | all | all | Mark that job is executed in GitLab CI environment | | **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_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 | | **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 | | **RESTORE_CACHE_ATTEMPTS** | 8.15 | 1.9 | Number of attempts to restore the cache running a job |
## 9.0 Renaming ## 9.0 Renaming

7
spec/models/ci/build_spec.rb
View file

@ -1247,8 +1247,11 @@ describe Ci::Build do
context 'when build has user' do context 'when build has user' do
let(:user_variables) do let(:user_variables) do
[{ key: 'GITLAB_USER_ID', value: user.id.to_s, public: true }, [
{ key: 'GITLAB_USER_EMAIL', value: user.email, public: true }] { key: 'GITLAB_USER_ID', value: user.id.to_s, public: true },
{ key: 'GITLAB_USER_EMAIL', value: user.email, public: true },
{ key: 'GITLAB_USER_NAME', value: user.name, public: true }
]
end end
before do before do