diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-04-11 13:09:46 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-04-18 13:17:47 +0200 |
| commit | b578fbfb8572860490cdfd0163bfbf5f999bb1e6 (patch) | |
| tree | 0cab0da4537210bb8381be968c663439f5baf96a /app | |
| parent | a1363d39c6fe79d830dbce468c02880d2a5d7996 (diff) | |
| download | gitlab-ce-b578fbfb8572860490cdfd0163bfbf5f999bb1e6.tar.gz | |
Make it possible to override build variables
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ci/build.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 89a9eb76331..61d39caeb79 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -147,7 +147,8 @@ module Ci end def variables - predefined_variables + yaml_variables + project_variables + trigger_variables + (predefined_variables + yaml_variables + project_variables + trigger_variables) + .reverse.uniq { |var| var[:key] }.reverse end def merge_request |