• Sean McGivern's avatar
    Fix conflict highlighting · 64a9e53b
    Sean McGivern authored
    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.
    64a9e53b
repository.rb 50.8 KB