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/github_import/importer/protected_branches_importer.rb')
-rw-r--r--lib/gitlab/github_import/importer/protected_branches_importer.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/github_import/importer/protected_branches_importer.rb b/lib/gitlab/github_import/importer/protected_branches_importer.rb
index b5be823d5ab..4372477f55d 100644
--- a/lib/gitlab/github_import/importer/protected_branches_importer.rb
+++ b/lib/gitlab/github_import/importer/protected_branches_importer.rb
@@ -11,9 +11,9 @@ module Gitlab
def each_object_to_import
repo = project.import_source
- protected_branches = client.branches(repo).select { |branch| branch.protection&.enabled }
+ protected_branches = client.branches(repo).select { |branch| branch.dig(:protection, :enabled) }
protected_branches.each do |protected_branch|
- object = client.branch_protection(repo, protected_branch.name)
+ object = client.branch_protection(repo, protected_branch[:name])
next if object.nil? || already_imported?(object)
yield object
@@ -44,7 +44,7 @@ module Gitlab
end
def id_for_already_imported_cache(protected_branch)
- protected_branch.name
+ protected_branch[:name]
end
end
end