Automatic merge of gitlab-org/gitlab-ce master

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)