diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-21 09:00:38 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-21 09:00:38 +0000 |
| commit | 6df3dd9d5ed6c16d60f560c906dded888d845953 (patch) | |
| tree | 36ca3c818f8c52993db78417cb9fbb293cdb2f9f /app/models | |
| parent | 49405ac746a8aa2a4854d14e4a8cb6539535b1a5 (diff) | |
| parent | cf6a35f09a3f38b124bd0e6013950f21b5bb1851 (diff) | |
| download | gitlab-ce-6df3dd9d5ed6c16d60f560c906dded888d845953.tar.gz | |
Merge branch 'post-merge-improve-of-ci-permissions' into 'master'
Post-merge improve of CI permissions
Improves code from !6409
See merge request !6432
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/ci/build.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index dd984aef318..cb87b43f6be 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -493,8 +493,11 @@ module Ci end def hide_secrets(trace) - trace = Ci::MaskSecret.mask(trace, project.runners_token) if project - trace = Ci::MaskSecret.mask(trace, token) + return unless trace + + trace = trace.dup + Ci::MaskSecret.mask!(trace, project.runners_token) if project + Ci::MaskSecret.mask!(trace, token) trace end end |