diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-21 15:27:18 +0300 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-05-22 14:32:09 +0300 |
| commit | 3ebaa2bdd3948cbe05cb8c4feaae7f39520703b3 (patch) | |
| tree | ebbcbc2de45b30473c4b4e39c87c0ffe42e5b456 /app | |
| parent | dc88ced2659f502c42da157fa184852e86c9f5b3 (diff) | |
Merge branch '46454-wrong-value-in-ci-deploy-user' into 'master'
Resolve "CI/CD jobs: Wrong value in env. variable CI_DEPLOY_USER using <gitlab-deploy-token> deploy token"
Closes #46454
See merge request gitlab-org/gitlab-ce!19047
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ci/build.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 61c10c427dd..e76b8d0bf50 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -661,7 +661,7 @@ module Ci Gitlab::Ci::Variables::Collection.new.tap do |variables| break variables unless gitlab_deploy_token - variables.append(key: 'CI_DEPLOY_USER', value: gitlab_deploy_token.name) + variables.append(key: 'CI_DEPLOY_USER', value: gitlab_deploy_token.username) variables.append(key: 'CI_DEPLOY_PASSWORD', value: gitlab_deploy_token.token, public: false) end end |