diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-05-04 23:02:51 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-06-01 14:39:48 +0200 |
| commit | e61f38d79eb85a7c601bd146d5b8e48a8b4418e5 (patch) | |
| tree | 08abc6cb3f4ef57de157167fca8189a162298ae1 /lib/api | |
| parent | c72abcefe79dd906cbbf0088b442a8979e9fc746 (diff) | |
| download | gitlab-ce-e61f38d79eb85a7c601bd146d5b8e48a8b4418e5.tar.gz | |
Fix data inconsistency issue for old artifacts by moving them to a currently used path
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/jobs.rb | 2 | ||||
| -rw-r--r-- | lib/api/runner.rb | 2 | ||||
| -rw-r--r-- | lib/api/v3/builds.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/jobs.rb b/lib/api/jobs.rb index 0223957fde1..7f94b1afdc4 100644 --- a/lib/api/jobs.rb +++ b/lib/api/jobs.rb @@ -225,7 +225,7 @@ module API end def present_artifacts!(artifacts_file) - if !artifacts_file.file_storage? + if !artifacts_file.local_file? redirect_to(build.artifacts_file.url) elsif artifacts_file.exists? present_file!(artifacts_file.path, artifacts_file.filename) diff --git a/lib/api/runner.rb b/lib/api/runner.rb index 6fbb02cb3aa..ddcc0429de0 100644 --- a/lib/api/runner.rb +++ b/lib/api/runner.rb @@ -242,7 +242,7 @@ module API job = authenticate_job! artifacts_file = job.artifacts_file - unless artifacts_file.file_storage? + unless artifacts_file.local_file? return redirect_to job.artifacts_file.url end diff --git a/lib/api/v3/builds.rb b/lib/api/v3/builds.rb index 21935922414..7ce7b43e3bd 100644 --- a/lib/api/v3/builds.rb +++ b/lib/api/v3/builds.rb @@ -226,7 +226,7 @@ module API end def present_artifacts!(artifacts_file) - if !artifacts_file.file_storage? + if !artifacts_file.local_file? redirect_to(build.artifacts_file.url) elsif artifacts_file.exists? present_file!(artifacts_file.path, artifacts_file.filename) |