root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'zj-info-attributes' into 'master' 

Move info attributes to mandatory

Closes gitaly#1082

See merge request gitlab-org/gitlab-ce!19988
This commit is contained in:
Douwe Maan 2018-06-19 09:55:48 +00:00
parent 9e82c32b31 012948b849
commit 14dda26b25
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/gitlab/git/repository.rb
View File

@ -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