1. 04 12月, 2018 1 次提交
  2. 26 11月, 2018 1 次提交
  3. 10 11月, 2018 1 次提交
  4. 08 11月, 2018 1 次提交
  5. 07 11月, 2018 3 次提交
  6. 06 11月, 2018 1 次提交
  7. 05 11月, 2018 1 次提交
    • P
      Re-implemented image commenting on diffs · f7df9ddb
      Phil Hughes 提交于
      This re-implements image commenting in merge request diffs.
      This feature was previously lost when the merge request
      page was refactored into Vue.
      
      With this, we create an overlay component. The overlay
      component handles displaying the comment badges
      and the comment form badge.
      Badges are displayed based on the position attribute
      sent with the discussion.
      
      Comment forms for diff files are controlled through
      a different state property. This is so we don't
      tie comment forms to diff files directly creating
      deep nested state. Instead we create a flat array
      which holds the file hash & the X & Y position of
      the comment form.
      
      Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48956
      f7df9ddb
  8. 01 11月, 2018 2 次提交
  9. 30 10月, 2018 1 次提交
    • M
      Make Highlight accept language param · 39ae9a59
      Mark Chao 提交于
      This replaces the repository param.
      This allows more flexiblity as sometimes we have highlight content
      not related to repository. Sometimes we know ahead of time the language
      of the content. Lastly language determination seems better fit as a
      logic in the Blob class.
      `repository` param is only used to determine the language, which seems
      to be the responsiblity of Blob.
      39ae9a59
  10. 02 10月, 2018 1 次提交
  11. 01 10月, 2018 1 次提交
    • M
      Fix MR discussion not loaded issue · f09303b0
      Mark Chao 提交于
      Display `formatter` as the sole content of `position` object.
      This means `diff_file` data is not referenced, which is the
      caseu of "IOError: not opened for reading".
      f09303b0
  12. 25 9月, 2018 1 次提交
  13. 19 9月, 2018 1 次提交
  14. 11 9月, 2018 1 次提交
  15. 07 9月, 2018 1 次提交
  16. 01 9月, 2018 1 次提交
  17. 29 8月, 2018 2 次提交
  18. 28 8月, 2018 1 次提交
  19. 21 8月, 2018 1 次提交
  20. 09 7月, 2018 1 次提交
  21. 04 7月, 2018 2 次提交
  22. 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
  23. 21 6月, 2018 1 次提交
  24. 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
  25. 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
  26. 01 5月, 2018 2 次提交
  27. 17 4月, 2018 1 次提交
  28. 05 4月, 2018 1 次提交
  29. 17 3月, 2018 1 次提交
  30. 15 3月, 2018 2 次提交
  31. 09 3月, 2018 1 次提交
  32. 08 3月, 2018 1 次提交
  33. 22 2月, 2018 1 次提交
    • S
      Fix 500 error when diff context line has broken encoding · cdf3ae04
      Sean McGivern 提交于
      Rugged sometimes chops a context line in between bytes, resulting in the context
      line having an invalid encoding: https://github.com/libgit2/rugged/issues/716
      
      When that happens, we will try to detect the encoding for the diff, and
      sometimes we'll get it wrong. If that difference in encoding results in a
      difference in string lengths between the diff and the underlying blobs, we'd
      fail to highlight any inline diffs, and return a 500 status to the user.
      
      As we're using the underlying blobs, the encoding is 'correct' anyway, so if the
      string range is invalid, we can just discard the inline diff highlighting. We
      still report to Sentry to ensure that we can investigate further in future.
      cdf3ae04