From e61f38d79eb85a7c601bd146d5b8e48a8b4418e5 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 4 May 2017 23:02:51 +0200
Subject: Fix data inconsistency issue for old artifacts by moving them to a
 currently used path

---
 lib/ci/api/builds.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/ci')

diff --git a/lib/ci/api/builds.rb b/lib/ci/api/builds.rb
index 67b269b330c..0f2044a54b4 100644
--- a/lib/ci/api/builds.rb
+++ b/lib/ci/api/builds.rb
@@ -187,7 +187,7 @@ module Ci
           build = authenticate_build!
           artifacts_file = build.artifacts_file
 
-          unless artifacts_file.file_storage?
+          unless artifacts_file.local_file?
             return redirect_to build.artifacts_file.url
           end
 
-- 
cgit v1.2.3


From 6185d12c183b539ea06ab3550b2c21045d169ca4 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 1 Jun 2017 09:52:19 +0200
Subject: Add missing specs

---
 lib/ci/api/builds.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/ci')

diff --git a/lib/ci/api/builds.rb b/lib/ci/api/builds.rb
index 0f2044a54b4..2285ef241d7 100644
--- a/lib/ci/api/builds.rb
+++ b/lib/ci/api/builds.rb
@@ -187,14 +187,14 @@ module Ci
           build = authenticate_build!
           artifacts_file = build.artifacts_file
 
-          unless artifacts_file.local_file?
-            return redirect_to build.artifacts_file.url
-          end
-
           unless artifacts_file.exists?
             not_found!
           end
 
+          unless artifacts_file.file_storage?
+            return redirect_to build.artifacts_file.url
+          end
+
           present_file!(artifacts_file.path, artifacts_file.filename)
         end
 
-- 
cgit v1.2.3


From 4cfa5ce4a95379a9ebe08f57b170af4b5ee9a9a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 2 Jun 2017 19:11:26 +0200
Subject: Enable the Style/PreferredHashMethods cop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 lib/ci/api/builds.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/ci')

diff --git a/lib/ci/api/builds.rb b/lib/ci/api/builds.rb
index 2285ef241d7..e2e91ce99cd 100644
--- a/lib/ci/api/builds.rb
+++ b/lib/ci/api/builds.rb
@@ -88,7 +88,7 @@ module Ci
         patch ":id/trace.txt" do
           build = authenticate_build!
 
-          error!('400 Missing header Content-Range', 400) unless request.headers.has_key?('Content-Range')
+          error!('400 Missing header Content-Range', 400) unless request.headers.key?('Content-Range')
           content_range = request.headers['Content-Range']
           content_range = content_range.split('-')
 
-- 
cgit v1.2.3