diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-01-25 11:01:36 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-01-25 11:01:36 +0000 |
| commit | d2bf53942fdb7368c914482ebdfdf1dc1a145cce (patch) | |
| tree | 1d0f0f086846c34980164a168f95b2eff045b02a /config | |
| parent | 1c4214322f76800b09058026bc6aff767d0c3f0c (diff) | |
| parent | 0683d31ab162284f9f37004da7365ce2f3e6da55 (diff) | |
| download | gitlab-ce-d2bf53942fdb7368c914482ebdfdf1dc1a145cce.tar.gz | |
Merge branch 'jej/gitattributes-check-at-ref' into 'master'
Can parse root .gitattributes file for a ref
See merge request gitlab-org/gitlab-ce!16418
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/rugged_use_gitlab_git_attributes.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/rugged_use_gitlab_git_attributes.rb b/config/initializers/rugged_use_gitlab_git_attributes.rb index 1cfb3bcb4bd..c0d45caec42 100644 --- a/config/initializers/rugged_use_gitlab_git_attributes.rb +++ b/config/initializers/rugged_use_gitlab_git_attributes.rb @@ -7,7 +7,7 @@ # repository-wide language statistics: # <https://github.com/github/linguist/blob/v4.7.0/lib/linguist/lazy_blob.rb#L33-L36> # -# The options passed by Linguist are those assumed by Gitlab::Git::Attributes +# The options passed by Linguist are those assumed by Gitlab::Git::InfoAttributes # anyway, and there is no great efficiency gain from just fetching the listed # attributes with our implementation, so we ignore the additional arguments. # @@ -19,7 +19,7 @@ module Rugged end def attributes - @attributes ||= Gitlab::Git::Attributes.new(path) + @attributes ||= Gitlab::Git::InfoAttributes.new(path) end end |