diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-07-31 13:30:06 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-07-31 13:30:06 +0000 |
| commit | bea3d730c2257d5c5e4f2539f4e4b1b81be84250 (patch) | |
| tree | 7217cff9ed26b0b994a7e4639869c39d04c1fd58 /lib | |
| parent | 7bab7b6993edbaf0d1fa2dfce315563dad676a44 (diff) | |
| parent | 759a3484ca787846f1fab9f86cd8105200ea722e (diff) | |
| download | gitlab-ce-bea3d730c2257d5c5e4f2539f4e4b1b81be84250.tar.gz | |
Merge branch 'add-project-scope-to-live-trace-feature-flag' into 'master'
Add project scope to live trace feature flag
See merge request gitlab-org/gitlab-ce!31325
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/trace.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ci/trace.rb b/lib/gitlab/ci/trace.rb index cb617080c76..9550bc6d39c 100644 --- a/lib/gitlab/ci/trace.rb +++ b/lib/gitlab/ci/trace.rb @@ -126,7 +126,7 @@ module Gitlab raise AlreadyArchivedError, 'Could not write to the archived trace' elsif current_path File.open(current_path, mode) - elsif Feature.enabled?('ci_enable_live_trace') + elsif Feature.enabled?('ci_enable_live_trace', job.project) Gitlab::Ci::Trace::ChunkedIO.new(job) else File.open(ensure_path, mode) |