diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-03 14:42:15 +0200 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-04 16:12:50 +0200 |
| commit | 86d8f0a91fb522c76dff2025afb4edb8479326f4 (patch) | |
| tree | 1e16633c7593779847aac44ddaa7e8b733543ea4 | |
| parent | f2b494cabc1c93bfb9f0c8d43b591e5029f5e7e3 (diff) | |
| download | gitlab-ce-86d8f0a91fb522c76dff2025afb4edb8479326f4.tar.gz | |
Fix bug
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | app/models/ci/build.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 9a42a663fb4..eb0875a977f 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ eslint-report.html /plugins/* /.gitlab_pages_secret package-lock.json +/junit_rspec.xml diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index eda86155aaf..53420091817 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -559,7 +559,7 @@ module Ci end def yaml_variables=(value) - unless BuildConfig.available? && Feature.enabled?(:ci_use_build_metadata_for_config) + unless Feature.enabled?(:ci_use_build_metadata_for_config) super else # save and remove from this model |