diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-11-17 17:57:48 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-11-17 17:57:48 +0000 |
| commit | 64a9e53bd16092e869f88e42a3e69f3f4ba0a23e (patch) | |
| tree | 0276365754d768dc70860901a8a396b861c36ac2 /app/models/repository.rb | |
| parent | 371180a47d292957b73c6c9e1e662b6c99a62ee9 (diff) | |
| download | gitlab-ce-64a9e53bd16092e869f88e42a3e69f3f4ba0a23e.tar.gz | |
Fix conflict highlightingfix-conflict-highlighting
Conflicts used to take a `Repository` and pass that to
`Gitlab::Highlight.highlight`, which would call `#gitattribute` on the
repository. Now they use a `Gitlab::Git::Repository`, which didn't have that
method defined - but defining it on `Gitlab::Git::Repository` does make it
available on `Repository` through `method_missing`, so we can do that and both
cases will work.
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 35ee12bdfa1..214f2daa199 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -994,10 +994,6 @@ class Repository raw_repository.ls_files(actual_ref) end - def gitattribute(path, name) - raw_repository.attributes(path)[name] - end - def copy_gitattributes(ref) actual_ref = ref || root_ref begin |