diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-19 09:55:48 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-19 09:55:48 +0000 |
| commit | 14dda26b251b43764c0c4c26685c6079480324f4 (patch) | |
| tree | 5f29bd69fe683a28481848dac1969d94b8179f15 | |
| parent | 9e82c32b31424f8899c53634239ceb0873cb5674 (diff) | |
| parent | 012948b849209cb954bbcfa93b39daa8087b41e5 (diff) | |
| download | gitlab-ce-14dda26b251b43764c0c4c26685c6079480324f4.tar.gz | |
Merge branch 'zj-info-attributes' into 'master'
Move info attributes to mandatory
Closes gitaly#1082
See merge request gitlab-org/gitlab-ce!19988
| -rw-r--r-- | lib/gitlab/git/repository.rb | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index a3aab1e0e85..40125e6aed4 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -978,21 +978,7 @@ module Gitlab def info_attributes return @info_attributes if @info_attributes - content = - gitaly_migrate(:get_info_attributes, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled| - if is_enabled - gitaly_repository_client.info_attributes - else - attributes_path = File.join(File.expand_path(path), 'info', 'attributes') - - if File.exist?(attributes_path) - File.read(attributes_path) - else - "" - end - end - end - + content = gitaly_repository_client.info_attributes @info_attributes = AttributesParser.new(content) end |