diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-06-14 15:01:29 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-06-19 10:02:12 +0200 |
| commit | 012948b849209cb954bbcfa93b39daa8087b41e5 (patch) | |
| tree | 510ba36429f9da5ddcf01d652adf2a4b478b90f3 | |
| parent | 41d01281cef0ae5c26f08c73df3e8f9078dcf1d3 (diff) | |
| download | gitlab-ce-012948b849209cb954bbcfa93b39daa8087b41e5.tar.gz | |
Move info attributes to mandatory
Closes https://gitlab.com/gitlab-org/gitaly/issues/1082
| -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 eb5d6318dcb..74be074980e 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -984,21 +984,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 |