Skip to content
GitLab Next
  • Menu
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • GitLab FOSS GitLab FOSS
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
    • Requirements
  • Merge requests 1
    • Merge requests 1
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Container Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • Code review
    • Insights
    • Issue
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • GitLab.org
  • GitLab FOSSGitLab FOSS
  • Merge requests
  • !12332

Fix linking to line number on parallel diff creating empty discussion box

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Eric Eastwood requested to merge 34010-fix-linking-to-parallel-diff-line-number-creating-gray-box into master Jun 21, 2017
  • Overview 1
  • Commits 1
  • Pipelines 2
  • Changes 5

What does this MR do?

EE MR, https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2207

Fix linking to line number on parallel diff creating empty discussion box when there are discussions on the same line.

Are there points in the code the reviewer needs to double check?

  • Using actual inline/parallel diff ajax responses in specs

Reproduction:

  1. Create a MR with some changes
  2. Switch to the parallel "Side-by-side" view, ?view=parallel
  3. Create a note on the diff and resolve it
  4. Click the line number that has the discussion on it. Your URL should look similar to this /diffs?view=parallel#3f58c61b62d64910afb975d31ceed28eb21c34c1_28_35
  5. Copy and visit the URL
  6. Notice, only the line is highlighted (no empty gray discussion box is shown)

Why was this MR needed?

Linking to line number on parallel diff when there are discussions on the same line, created an empty discussion box.

This regressed in 9.2 from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11327/diffs#192369e4731a70b7fe3155cc69bbbd55b33c7932_281_287

Does this MR meet the acceptance criteria?

  • Changelog entry added, if necessary
  • Tests
    • Added for this feature/bug
    • All builds are passing
  • Conform by the merge request performance guides
  • Conform by the style guides
  • Branch has no merge conflicts with master (if it does - rebase it please)
  • Squashed related commits together

What are the relevant issue numbers?

Closes #34010 (closed)

Edited Jun 21, 2017 by Eric Eastwood
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: 34010-fix-linking-to-parallel-diff-line-number-creating-gray-box