diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 12:07:52 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 12:07:52 +0000 |
| commit | 374cf04cf2a496344e0e27d8ddf740f7a543f7af (patch) | |
| tree | fb8ecdec56537bfe48551fa333715d5f38c41561 /app/models/ci | |
| parent | 1f5a2543e4daf21dd98d8ff0514781c403445c81 (diff) | |
| download | gitlab-ce-374cf04cf2a496344e0e27d8ddf740f7a543f7af.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/ci')
| -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 7f64ea7dd97..645b87ce68c 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -576,7 +576,7 @@ module Ci def environment_changed_page_variables Gitlab::Ci::Variables::Collection.new.tap do |variables| - break variables unless environment_status + break variables unless environment_status && Feature.enabled?(:modifed_path_ci_variables, project) variables.append(key: 'CI_MERGE_REQUEST_CHANGED_PAGE_PATHS', value: environment_status.changed_paths.join(',')) variables.append(key: 'CI_MERGE_REQUEST_CHANGED_PAGE_URLS', value: environment_status.changed_urls.join(',')) |