1. 28 Aug, 2018 1 commit
  2. 01 Jun, 2018 1 commit
  3. 17 Nov, 2017 1 commit
    • 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
  4. 13 Oct, 2017 2 commits
  5. 27 Jul, 2017 2 commits
  6. 18 Jul, 2017 1 commit
  7. 17 Jul, 2017 1 commit
  8. 21 Jun, 2017 1 commit
  9. 24 Feb, 2017 1 commit
  10. 23 Feb, 2017 3 commits
  11. 25 Jan, 2017 1 commit
  12. 13 Oct, 2016 1 commit
  13. 12 Aug, 2016 11 commits