diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-15 19:56:15 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-15 19:56:15 +0000 |
| commit | b540b987648ae6e24bbbc01a7773b2e3209a47b0 (patch) | |
| tree | 904ace3d5524eef227976910e136f98925e62371 /config/initializers/rugged_use_gitlab_git_attributes.rb | |
| parent | 95f5a525b5a729725d6b559101026b8f39c9c39d (diff) | |
| parent | 02994fbe7715ef4539f720b6d395eeb9a3d71f14 (diff) | |
| download | gitlab-ce-b540b987648ae6e24bbbc01a7773b2e3209a47b0.tar.gz | |
Merge branch 'no-ivar-in-modules' into 'master'
Add cop to make sure we don't use ivar in a module
See merge request gitlab-org/gitlab-ce!12800
Diffstat (limited to 'config/initializers/rugged_use_gitlab_git_attributes.rb')
| -rw-r--r-- | config/initializers/rugged_use_gitlab_git_attributes.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/initializers/rugged_use_gitlab_git_attributes.rb b/config/initializers/rugged_use_gitlab_git_attributes.rb index 7d652799786..1cfb3bcb4bd 100644 --- a/config/initializers/rugged_use_gitlab_git_attributes.rb +++ b/config/initializers/rugged_use_gitlab_git_attributes.rb @@ -15,8 +15,11 @@ module Rugged class Repository module UseGitlabGitAttributes def fetch_attributes(name, *) + attributes.attributes(name) + end + + def attributes @attributes ||= Gitlab::Git::Attributes.new(path) - @attributes.attributes(name) end end |