summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/api/runner.rb3
-rw-r--r--lib/gitlab/ci/build/artifacts/metadata.rb2
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/api/runner.rb b/lib/api/runner.rb
index 2b85eb8ea68..2bcf487fa38 100644
--- a/lib/api/runner.rb
+++ b/lib/api/runner.rb
@@ -223,8 +223,7 @@ module API
Gitlab::CurrentSettings.current_application_settings.default_artifacts_expire_in
if job.save
- status :created
- #present job, with: Entities::JobRequest::Response
+ present job, with: Entities::JobRequest::Response
else
render_validation_error!(job)
end
diff --git a/lib/gitlab/ci/build/artifacts/metadata.rb b/lib/gitlab/ci/build/artifacts/metadata.rb
index a788fb3fcbc..a375ccbece0 100644
--- a/lib/gitlab/ci/build/artifacts/metadata.rb
+++ b/lib/gitlab/ci/build/artifacts/metadata.rb
@@ -60,7 +60,7 @@ module Gitlab
begin
path = read_string(gz).force_encoding('UTF-8')
meta = read_string(gz).force_encoding('UTF-8')
-
+
next unless path.valid_encoding? && meta.valid_encoding?
next unless path =~ match_pattern
next if path =~ INVALID_PATH_PATTERN