Skip to content
Snippets Groups Projects

Add option to start a new resolvable discussion in an MR

Merged Douwe Maan requested to merge new-resolvable-discussion into master

Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/24378

EE port: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1556

To do:

Out of scope:

Button in form:

Screen_Shot_2016-11-17_at_13.34.37

After tabbing to the button:

Screen_Shot_2016-11-17_at_13.52.48

After hitting Command+Option+Return (or Ctrl-Alt-Enter on Windows), a new discussion appears:

Screen_Shot_2016-11-17_at_13.56.23

/cc @smcgivern

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • mentioned in issue #29266 (closed)

  • Douwe Maan added 83 commits

    added 83 commits

    Compare with previous version

  • Rebased against master to get my base branches sync'd.

  • Luke Bennett added 86 commits

    added 86 commits

    Compare with previous version

  • Luke Bennett resolved all discussions

    resolved all discussions

  • Douwe Maan added 39 commits

    added 39 commits

    Compare with previous version

  • Luke Bennett
  • Douwe Maan added 127 commits

    added 127 commits

    Compare with previous version

  • I rebased against master, got some crazy conflicts in another branch and I think this might help, sorry! :cry:

    Edited by Luke Bennett
  • Luke Bennett added 18 commits

    added 18 commits

    Compare with previous version

  • Luke Bennett
  • Luke Bennett added 5 commits

    added 5 commits

    Compare with previous version

  • Author Contributor

    @lbennett No problem. Did you just rebase against master or did some other stuff to? If it's just the rebase, I can force push the rebase + some other changes I already did locally :)

  • @DouweM Just rebased against master, no conflicts either.

  • marked the task Better notifications (https://gitlab.com/gitlab-org/gitlab-ce/issues/24378#note_25365790) as completed

  • Douwe Maan added 51 commits

    added 51 commits

    Compare with previous version

  • Douwe Maan marked the task Reply by email support as completed

    marked the task Reply by email support as completed

  • Douwe Maan added 1 commit

    added 1 commit

    • 5dabf302 - Better notification emails for notes and (diff) discussions

    Compare with previous version

  • Author Contributor

    @rspeicher Can you please do a preliminary review? I have yet to add some code comments around tricky bits, as well as specs and docs, but otherwise it should be functionally complete (aside from whatever changes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9701 will bring). I'd like to get some input on the approach before I write specs that may have to be removed/refactored a lot :)

  • assigned to @rspeicher

  • Douwe Maan added 1 commit

    added 1 commit

    • 8e5151ef - Enable discussions on issues, commits and snippets

    Compare with previous version

  • Author Contributor

    @tauriedavis These are our new discussion notification emails:

    new_discussion

    comment_on_discussion

    new_diff_discussion

    comment_on_diff_discussion

  • That looks good to me @DouweM - thanks!

  • Douwe Maan added 146 commits

    added 146 commits

    Compare with previous version

  • Douwe Maan marked the task Specs as completed

    marked the task Specs as completed

  • Douwe Maan added 136 commits

    added 136 commits

    Compare with previous version

  • Douwe Maan added 1 commit

    added 1 commit

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading