diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-11-28 12:22:40 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-11-28 12:22:40 +0000 |
| commit | 85ff313a1ecf3fc0ffbf1989533d4fa38bd8daf8 (patch) | |
| tree | b9d637eead406c85d06159baf885bee69f65b604 /app/models/concerns | |
| parent | c26d7089d058dc22116f383815da8cec80a99ac5 (diff) | |
| parent | fa35ea13873f81405c5203f0827ea15703615c97 (diff) | |
| download | gitlab-ce-85ff313a1ecf3fc0ffbf1989533d4fa38bd8daf8.tar.gz | |
Merge branch '40561-environment-scope-value-is-not-trimmed' into 'master'
Strip leading & trailing whitespaces in CI/CD secret variable keys
See merge request gitlab-org/gitlab-ce!15615
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/has_variable.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/concerns/has_variable.rb b/app/models/concerns/has_variable.rb index 9585b5583dc..8a241e4374a 100644 --- a/app/models/concerns/has_variable.rb +++ b/app/models/concerns/has_variable.rb @@ -16,6 +16,10 @@ module HasVariable key: Gitlab::Application.secrets.db_key_base, algorithm: 'aes-256-cbc' + def key=(new_key) + super(new_key.to_s.strip) + end + def to_runner_variable { key: key, value: value, public: false } end |