Commit 14dda26b authored by Douwe Maan's avatar Douwe Maan

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

Move info attributes to mandatory

Closes gitaly#1082

See merge request gitlab-org/gitlab-ce!19988
parents 9e82c32b 012948b8
...@@ -978,21 +978,7 @@ module Gitlab ...@@ -978,21 +978,7 @@ module Gitlab
def info_attributes def info_attributes
return @info_attributes if @info_attributes return @info_attributes if @info_attributes
content = content = gitaly_repository_client.info_attributes
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
@info_attributes = AttributesParser.new(content) @info_attributes = AttributesParser.new(content)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment