1883e320ea
Previously the raw push option Array was sent to Pipeline::Chain::Skip.
This commit updates this class (and the chain of classes that pass the
push option parameters from the API internal `post_receive` endpoint to
that class) to treat push options as a Hash of options parsed by
GitLab::PushOptions.
The GitLab::PushOptions class takes options like this:
-o ci.skip -o merge_request.create -o merge_request.target=branch
and turns them into a Hash like this:
{
ci: {
skip: true
},
merge_request: {
create: true,
target: 'branch'
}
}
This now how Pipeline::Chain::Skip is determining if the `ci.skip` push
option was used.
47 lines
1.2 KiB
Ruby
47 lines
1.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module Gitlab
|
|
class GitPostReceive
|
|
include Gitlab::Identifier
|
|
attr_reader :project, :identifier, :changes, :push_options
|
|
|
|
def initialize(project, identifier, changes, push_options = {})
|
|
@project = project
|
|
@identifier = identifier
|
|
@changes = deserialize_changes(changes)
|
|
@push_options = push_options
|
|
end
|
|
|
|
def identify
|
|
super(identifier)
|
|
end
|
|
|
|
def changes_refs
|
|
return changes unless block_given?
|
|
|
|
changes.each do |change|
|
|
change.strip!
|
|
oldrev, newrev, ref = change.split(' ')
|
|
|
|
yield oldrev, newrev, ref
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def deserialize_changes(changes)
|
|
utf8_encode_changes(changes).each_line
|
|
end
|
|
|
|
def utf8_encode_changes(changes)
|
|
changes.force_encoding('UTF-8')
|
|
return changes if changes.valid_encoding?
|
|
|
|
# Convert non-UTF-8 branch/tag names to UTF-8 so they can be dumped as JSON.
|
|
detection = CharlockHolmes::EncodingDetector.detect(changes)
|
|
return changes unless detection && detection[:encoding]
|
|
|
|
CharlockHolmes::Converter.convert(changes, detection[:encoding], 'UTF-8')
|
|
end
|
|
end
|
|
end
|