Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/ci/external/file/local.rb')
-rw-r--r--lib/gitlab/ci/external/file/local.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/gitlab/ci/external/file/local.rb b/lib/gitlab/ci/external/file/local.rb
index 1aa7f687507..2b0a5487fe4 100644
--- a/lib/gitlab/ci/external/file/local.rb
+++ b/lib/gitlab/ci/external/file/local.rb
@@ -5,13 +5,14 @@ module Gitlab
module External
module File
class Local < Base
- attr_reader :location, :project, :sha
+ attr_reader :location, :project, :sha, :ignore_if_missing
def initialize(location, opts = {})
super
@project = opts.fetch(:project)
@sha = opts.fetch(:sha)
+ @ignore_if_missing = opts.fetch(:ignore_if_missing)
end
def content
@@ -25,7 +26,13 @@ module Gitlab
private
def fetch_local_content
- project.repository.blob_data_at(sha, location)
+ content = project.repository.blob_data_at(sha, location)
+
+ if content.nil? && @ignore_if_missing
+ return '{}'
+ end
+
+ content
end
end
end