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

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Cai <jcai@gitlab.com>2019-07-04 23:08:40 +0300
committerJohn Cai <jcai@gitlab.com>2019-07-04 23:08:40 +0300
commit873a408c49ef1b34fce0cd47a80aa192f426d7c0 (patch)
tree97a730fffb8551b3afe487dcfeca10d4e8087178
parenta8225e767e542106029995c53bd06d77e18350ac (diff)
parent62463a4b3992b0fd47f1a98edc26a6eb5b21909a (diff)
Merge branch 'jv-remove-namespace-check' into 'master'
Remove gitaly migration era namespace check See merge request gitlab-org/gitaly!1352
-rw-r--r--ruby/lib/gitlab/git.rb7
-rw-r--r--ruby/lib/gitlab/git/operation_service.rb5
-rw-r--r--ruby/lib/gitlab/git/repository.rb6
3 files changed, 0 insertions, 18 deletions
diff --git a/ruby/lib/gitlab/git.rb b/ruby/lib/gitlab/git.rb
index 3688b2be5..33ff52453 100644
--- a/ruby/lib/gitlab/git.rb
+++ b/ruby/lib/gitlab/git.rb
@@ -100,13 +100,6 @@ module Gitlab
Gitlab::Git::Version.git_version
end
- def check_namespace!(*objects)
- expected_namespace = self.name + '::'
- objects.each do |object|
- raise ArgumentError, "expected object in #{expected_namespace}, got #{object}" unless object.class.name.start_with?(expected_namespace)
- end
- end
-
def diff_line_code(file_path, new_line_position, old_line_position)
"#{Digest::SHA1.hexdigest(file_path)}_#{old_line_position}_#{new_line_position}"
end
diff --git a/ruby/lib/gitlab/git/operation_service.rb b/ruby/lib/gitlab/git/operation_service.rb
index f011f1aaa..9bf7ae80d 100644
--- a/ruby/lib/gitlab/git/operation_service.rb
+++ b/ruby/lib/gitlab/git/operation_service.rb
@@ -22,10 +22,6 @@ module Gitlab
def initialize(user, new_repository)
@user = user
-
- # Refactoring aid
- Gitlab::Git.check_namespace!(new_repository)
-
@repository = new_repository
end
@@ -78,7 +74,6 @@ module Gitlab
start_repository: repository,
force: false,
&block)
- Gitlab::Git.check_namespace!(start_repository)
start_repository = RemoteRepository.new(start_repository) unless start_repository.is_a?(RemoteRepository)
start_branch_name = nil if start_repository.empty?
diff --git a/ruby/lib/gitlab/git/repository.rb b/ruby/lib/gitlab/git/repository.rb
index 66b545084..8aa33709e 100644
--- a/ruby/lib/gitlab/git/repository.rb
+++ b/ruby/lib/gitlab/git/repository.rb
@@ -320,8 +320,6 @@ module Gitlab
start_repository: start_repository
) do |start_commit|
- Gitlab::Git.check_namespace!(commit, start_repository)
-
revert_tree_id = check_revert_content(commit, start_commit.sha)
raise CreateTreeError unless revert_tree_id
@@ -491,7 +489,6 @@ module Gitlab
# rubocop:enable Metrics/ParameterLists
def with_repo_branch_commit(start_repository, start_branch_name)
- Gitlab::Git.check_namespace!(start_repository)
start_repository = RemoteRepository.new(start_repository) unless start_repository.is_a?(RemoteRepository)
return yield nil if start_repository.empty?
@@ -618,7 +615,6 @@ module Gitlab
end
def fetch_ref(source_repository, source_ref:, target_ref:)
- Gitlab::Git.check_namespace!(source_repository)
source_repository = RemoteRepository.new(source_repository) unless source_repository.is_a?(RemoteRepository)
args = %W[fetch --no-tags -f #{GITALY_INTERNAL_URL} #{source_ref}:#{target_ref}]
@@ -835,8 +831,6 @@ module Gitlab
start_repository: start_repository
) do |start_commit|
- Gitlab::Git.check_namespace!(commit, start_repository)
-
cherry_pick_tree_id = check_cherry_pick_content(commit, start_commit.sha)
raise CreateTreeError unless cherry_pick_tree_id