summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-05-02 16:56:48 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-05-02 16:56:48 +0000
commit4e67122e389708d766a2a90daa059f05b0f980c5 (patch)
tree0c21d8bd49f122440e41d31b68d4228782fd91e4 /lib
parentd753336eb56bcd8485fd2774d54ddcba9161f5e3 (diff)
parentee7d2c1b2f91a299179cbb0b36e1b870b6c36903 (diff)
downloadgitlab-ce-4e67122e389708d766a2a90daa059f05b0f980c5.tar.gz
Merge branch '27777-drop-projects-ci_id-column' into 'master'
Resolve "Drop "projects"."ci_id" column" Closes #27777 See merge request gitlab-org/gitlab-ce!27623
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ci/trace.rb14
1 files changed, 1 insertions, 13 deletions
diff --git a/lib/gitlab/ci/trace.rb b/lib/gitlab/ci/trace.rb
index bf5f2a31f0e..dfae260239e 100644
--- a/lib/gitlab/ci/trace.rb
+++ b/lib/gitlab/ci/trace.rb
@@ -209,10 +209,7 @@ module Gitlab
end
def paths
- [
- default_path,
- deprecated_path
- ].compact
+ [default_path]
end
def default_directory
@@ -227,15 +224,6 @@ module Gitlab
File.join(default_directory, "#{job.id}.log")
end
- def deprecated_path
- File.join(
- Settings.gitlab_ci.builds_path,
- job.created_at.utc.strftime("%Y_%m"),
- job.project.ci_id.to_s,
- "#{job.id}.log"
- ) if job.project&.ci_id
- end
-
def trace_artifact
job.job_artifacts_trace
end