1. 18 11月, 2017 2 次提交
    • S
      Fix conflict highlighting · 64a9e53b
      Sean McGivern 提交于
      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
    • D
      Merge branch 'mk-add-user-rate-limits' into 'master' · 371180a4
      Douwe Maan 提交于
      Add request rate limits
      
      Closes #30053
      
      See merge request gitlab-org/gitlab-ce!14708
      371180a4
  2. 17 11月, 2017 38 次提交