summaryrefslogtreecommitdiff
path: root/config/initializers
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2018-01-11 23:12:34 +0000
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2018-01-24 05:15:37 +0000
commit0683d31ab162284f9f37004da7365ce2f3e6da55 (patch)
treec3b784c9577f4fcaaba8cc0b7f3e65946ec94b34 /config/initializers
parentbe623ef3c1a867d23e9625fe372c17fcad3c47ce (diff)
downloadgitlab-ce-0683d31ab162284f9f37004da7365ce2f3e6da55.tar.gz
Can parse root .gitattributes file for a refjej/gitattributes-check-at-ref
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/rugged_use_gitlab_git_attributes.rb4
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