1. 14 12月, 2018 1 次提交
  2. 12 12月, 2018 1 次提交
  3. 10 11月, 2018 1 次提交
  4. 08 11月, 2018 1 次提交
  5. 07 11月, 2018 2 次提交
    • G
      Enable even more frozen string in lib/gitlab · 7e6f6e16
      gfyoung 提交于
      Enables frozens string for the following:
      
      * lib/gitlab/conflict/**/*.rb
      * lib/gitlab/cross_project_access/**/*.rb
      * lib/gitlab/cycle_analytics/**/*.rb
      * lib/gitlab/data_builder/**/*.rb
      * lib/gitlab/database/**/*.rb
      * lib/gitlab/dependency_linker/**/*.rb
      * lib/gitlab/diff/**/*.rb
      * lib/gitlab/downtime_check/**/*.rb
      * lib/gitlab/email/**/*.rb
      * lib/gitlab/etag_caching/**/*.rb
      
      Partially addresses gitlab-org/gitlab-ce#47424.
      7e6f6e16
    • O
      Comment on any expanded diff line on MRs · ec66ef1b
      Oswaldo Ferreira 提交于
      ec66ef1b
  6. 19 9月, 2018 1 次提交
  7. 11 9月, 2018 1 次提交
  8. 04 7月, 2018 1 次提交
  9. 29 6月, 2018 1 次提交
    • J
      Don't add bottom 'match' line for deleted files · 26a8472d
      Jan Provaznik 提交于
      If a file is deleted, its new_pos is 0 (less than
      total_blob_lines), but there is no reason to add the
      bottom 'match' line in this case because there is not
      extra content which could be expanded.
      26a8472d
  10. 21 6月, 2018 1 次提交
  11. 05 6月, 2018 1 次提交
    • O
      Adjust insufficient diff hunks being persisted on NoteDiffFile · f4673919
      Oswaldo Ferreira 提交于
      This currently causes 500's errors when loading the MR page
      (Discussion) in a few scenarios.
      
      We were not considering detailed diff headers such as
      "--- a/doc/update/mysql_to_postgresql.md\n+++ b/doc/update/mysql_to_postgresql.md"
      to crop the diff. In order to address it, we're now using
      Gitlab::Diff::Parser, clean the diffs and builds Gitlab::Diff::Line objects
      we can iterate and filter on.
      f4673919
  12. 25 5月, 2018 1 次提交
    • O
      Persist truncated note diffs on a new table · bb8f2520
      Oswaldo Ferreira 提交于
      We request Gitaly in a N+1 manner to build discussion diffs. Once the diffs are from different revisions, it's hard to make a single request to the service in order to build the whole response.
      With this change we solve this problem and simplify a lot fetching this piece of info.
      bb8f2520
  13. 17 3月, 2018 1 次提交
  14. 04 1月, 2018 1 次提交
    • S
      Fix error when viewing diffs without blobs · 528b5eeb
      Sean McGivern 提交于
      Old merge requests can have diffs without corresponding blobs. (This also may be
      possible for commit diffs in corrupt repositories.)
      
      We can't use the `&.` operator on the blobs, because the blob objects are never
      nil, but `BatchLoader` instances that delegate to `Blob`. We can't use
      `Object#try`, because `Blob` doesn't inherit from `Object`.
      
      `BatchLoader` provides a `__sync` method that returns the delegated object, but
      using `itself` also works because it's forwarded, and will work for
      non-`BatchLoader` instances too. So the simplest solution is to just use that
      with the `&.` operator.
      528b5eeb
  15. 23 12月, 2017 1 次提交
  16. 21 11月, 2017 1 次提交
  17. 13 10月, 2017 3 次提交
  18. 07 10月, 2017 1 次提交
  19. 21 9月, 2017 1 次提交
  20. 24 8月, 2017 1 次提交
    • S
      Show un-highlighted diffs when blobs are the same · e8525e10
      Sean McGivern 提交于
      For some old merge requests, we don't have enough information to figure out the
      old blob and the new blob for the file. This means that we can't highlight the
      diff correctly, but we can still display it without highlighting.
      e8525e10
  21. 22 8月, 2017 1 次提交
    • S
      Always return a simple diff viewer · b0f09406
      Sean McGivern 提交于
      We didn't have a fallback case before, because we believed the conditions were
      exhaustive. They weren't, so we can always fallback to not previewing.
      b0f09406
  22. 31 7月, 2017 1 次提交
  23. 14 6月, 2017 1 次提交
  24. 08 6月, 2017 2 次提交
  25. 24 5月, 2017 3 次提交
  26. 29 11月, 2016 1 次提交
  27. 25 11月, 2016 2 次提交
    • H
      Add keyword arguments to truncated_diff method · a761c59a
      hhoopes 提交于
      * Added keyword arguments to truncated_diff_lines method to allow for using highlighting or not (html templates vs. text)
      * Tweaked templates for consistency and format appropriateness
      a761c59a
    • H
      Change diff highlight/truncate for reusability · f928dba9
      hhoopes 提交于
      Previously the `truncated_diff_lines` method for outputting a discussion diff took in already highlighted lines, which meant it wasn't reuseable for truncating ANY lines. In the way it was used, it also meant that for any email truncation, the whole diff was being highlighted before being truncated, meaning wasted time highlighting lines that wouldn't even be used (granted, they were being memoized, so perhaps this wasn't that great of an issue). I refactored truncation away from highlighting, in order to truncate formatted diffs for text templates in email, using `>`s to designate each line, but otherwise retaining the parsing already done to create `diff_lines`.
      
      Additionally, while notes on merge requests or commits had already been tested, there was no existing test for notes on a diff on an MR or commit. Added mailer tests for such, and a unit test for truncating diff lines.
      f928dba9
  28. 14 11月, 2016 1 次提交
  29. 11 11月, 2016 1 次提交
  30. 18 10月, 2016 1 次提交
  31. 03 8月, 2016 2 次提交
  32. 19 7月, 2016 1 次提交