Skip to content
Snippets Groups Projects

Mix commit notes with merge request notes on MR show page

Merged Mix commit notes with merge request notes on MR show page
github/fork/riyad/show-commit-notes-with-mr-notes into master
Merged gitlab-qa-bot requested to merge github/fork/riyad/show-commit-notes-with-mr-notes into master

Created by: riyad

general:

  • add ids to diff lines (for linking, see below)
  • add helpers for dealing with notes for different targets

on MR show page

  • show merge request notes together with all the notes from its commits
  • if a note is from a commit/diff line add a link to the commit/line
  • fix vote counting to only count merge request notes (not commit notes)

Depends on #1629 Fixes #1622 (closed)

screen shot: mixed notes in mr comments section

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
  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: riyad

    @randx Updated title and description to be clearer. :)

    By Administrator on 2012-10-09T15:03:50 (imported from GitLab project)

    By Administrator on 2012-10-09T15:03:50 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: riyad

    Rebased on master

    By Administrator on 2012-10-09T23:57:22 (imported from GitLab project)

    By Administrator on 2012-10-09T23:57:22 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: dzaporozhets

    :thumbsup: I like an idea. Can you please make it mergeable & squash to few commits

    By Administrator on 2012-10-10T08:52:13 (imported from GitLab project)

    By Administrator on 2012-10-10T08:52:13 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: riyad

    hmm ... ok.

    By Administrator on 2012-10-10T08:53:39 (imported from GitLab project)

    By Administrator on 2012-10-10T08:53:39 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: dzaporozhets

    @Riyad Also i added you to gitlab pushers :) I trust you now

    By Administrator on 2012-10-10T08:56:47 (imported from GitLab project)

    By Administrator on 2012-10-10T08:56:47 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: riyad

    @randx Thanks, I'll be careful. :)

    By Administrator on 2012-10-10T08:59:47 (imported from GitLab project)

    By Administrator on 2012-10-10T08:59:47 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: riyad

    Rebased and sqashed.

    By Administrator on 2012-10-10T10:21:57 (imported from GitLab project)

    By Administrator on 2012-10-10T10:21:57 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: dzaporozhets

    merged! Thank you

    By Administrator on 2012-10-10T11:47:52 (imported from GitLab project)

    By Administrator on 2012-10-10T11:47:52 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: riyad

    You are welcome :)

    By Administrator on 2012-10-10T12:21:18 (imported from GitLab project)

    By Administrator on 2012-10-10T12:21:18 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: sroth80021

    @Riyad -- thanks!

    By Administrator on 2012-10-10T21:24:57 (imported from GitLab project)

    By Administrator on 2012-10-10T21:24:57 (imported from GitLab)

Please register or sign in to reply