diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-03-17 12:59:00 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-03-17 12:59:00 +0300 |
| commit | 1ac28387afcfb33e682059d20cb6517182ed60a3 (patch) | |
| tree | 9deed56544754a70d05391b301d38386e45c6505 | |
| parent | c97634bfb5ef36d50fad2cdcaab384455e422cd0 (diff) | |
| parent | 2b157301a227783d52a032af92d392c840622a93 (diff) | |
Merge branch 'jv-removed-unused-data' into 'master'
Remove request fields ignored by GitLab API
See merge request gitlab-org/gitaly!1927
| -rw-r--r-- | ruby/gitlab-shell/lib/object_dirs_helper.rb | 2 | ||||
| -rw-r--r-- | ruby/gitlab-shell/spec/object_dirs_helper_spec.rb | 2 | ||||
| -rw-r--r-- | ruby/lib/gitlab/git/repository.rb | 8 |
3 files changed, 0 insertions, 12 deletions
diff --git a/ruby/gitlab-shell/lib/object_dirs_helper.rb b/ruby/gitlab-shell/lib/object_dirs_helper.rb index e175a0392..2c1642ba9 100644 --- a/ruby/gitlab-shell/lib/object_dirs_helper.rb +++ b/ruby/gitlab-shell/lib/object_dirs_helper.rb @@ -4,9 +4,7 @@ class ObjectDirsHelper class << self def all_attributes { - "GIT_ALTERNATE_OBJECT_DIRECTORIES" => absolute_alt_object_dirs, "GIT_ALTERNATE_OBJECT_DIRECTORIES_RELATIVE" => relative_alt_object_dirs, - "GIT_OBJECT_DIRECTORY" => absolute_object_dir, "GIT_OBJECT_DIRECTORY_RELATIVE" => relative_object_dir } end diff --git a/ruby/gitlab-shell/spec/object_dirs_helper_spec.rb b/ruby/gitlab-shell/spec/object_dirs_helper_spec.rb index c2d0db7f7..d642608ce 100644 --- a/ruby/gitlab-shell/spec/object_dirs_helper_spec.rb +++ b/ruby/gitlab-shell/spec/object_dirs_helper_spec.rb @@ -9,9 +9,7 @@ describe ObjectDirsHelper do describe '.all_attributes' do it do expect(described_class.all_attributes.keys).to include(*%w[ - GIT_OBJECT_DIRECTORY GIT_OBJECT_DIRECTORY_RELATIVE - GIT_ALTERNATE_OBJECT_DIRECTORIES GIT_ALTERNATE_OBJECT_DIRECTORIES_RELATIVE ]) end diff --git a/ruby/lib/gitlab/git/repository.rb b/ruby/lib/gitlab/git/repository.rb index af9feda30..0ca8daca2 100644 --- a/ruby/lib/gitlab/git/repository.rb +++ b/ruby/lib/gitlab/git/repository.rb @@ -9,14 +9,6 @@ module Gitlab include Gitlab::EncodingHelper include Gitlab::Utils::StrongMemoize - ALLOWED_OBJECT_DIRECTORIES_VARIABLES = %w[ - GIT_OBJECT_DIRECTORY - GIT_ALTERNATE_OBJECT_DIRECTORIES - ].freeze - ALLOWED_OBJECT_RELATIVE_DIRECTORIES_VARIABLES = %w[ - GIT_OBJECT_DIRECTORY_RELATIVE - GIT_ALTERNATE_OBJECT_DIRECTORIES_RELATIVE - ].freeze # In https://gitlab.com/gitlab-org/gitaly/merge_requests/698 # We copied these two prefixes into gitaly-go, so don't change these # or things will break! (REBASE_WORKTREE_PREFIX and SQUASH_WORKTREE_PREFIX) |