Skip to content
Snippets Groups Projects

Add setting to resolve outdated diff comments on push

Merged Add setting to resolve outdated diff comments on push
AshleyDumaine/gitlab-ce-36994-toggle-for-automatically-collapsing-outdated-diff-comments into master
All threads resolved!
Merged Sean McGivern requested to merge AshleyDumaine/gitlab-ce-36994-toggle-for-automatically-collapsing-outdated-diff-comments into master
All threads resolved!

What does this MR do?

Adds a new project setting for MRs that, when set, automatically resolved outdated diff discussions on a push to an MR.

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

I think the whole resolve_without_save thing makes sense, but would be good to check!

Screenshots

When the setting is enabled:

image

Expanded:

image

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/36994.

Edited by Sean McGivern

Merge request reports

Pipeline #11489048 passed with warnings

Stage: build
Stage: prepare
Stage: test
Stage: post-test

Pipeline passed with warnings for b40941db on AshleyDumaine/gitlab-ce-36994-toggle-for-automatically-collapsing-outdated-diff-comments

Test coverage 72.16% (0.10%) from 2 jobs
Approved by
Douwe Maan

Merged by avatar (Apr 18, 2025 8:24pm UTC)

Merge details

Pipeline #11495488 passed with warnings

Stage: build
Stage: prepare
Stage: test
Stage: post-test
Stage: pages
Stage: deploy

Pipeline passed with warnings for 99852965 on master

Test coverage 72.18% (0.10%) from 2 jobs

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Douwe Maan
    Douwe Maan @DouweM
    Contributor

    @smcgivern One question, otherwise perfect. Nice work, you and @AshleyDumaine!

  • Douwe Maan assigned to @smcgivern

    assigned to @smcgivern

  • Sean McGivern added 46 commits

    added 46 commits

    • 79a51f9e...446c7fc6 - 38 commits from branch master
    • ef4b3a39 - Add functionality to collapse outdated diff comments regardless of discussion resolution
    • 959e6d22 - add unit tests for new collapse_outdated_diff_comments toggle
    • a3f76b76 - change collapse to resolve and comments to discussions
    • ac816d90 - Fix migration
    • e8f29569 - Resolve outdated diff discussions on push
    • 7f778b7a - Tidy up projects API specs
    • 007b325d - Add author and MR to changelog
    • b40941db - Fix note resolution specs

    Compare with previous version

    Toggle commit list
  • Sean McGivern
    Sean McGivern @smcgivern
    Author Contributor

    @DouweM green now!

  • Sean McGivern assigned to @DouweM

    assigned to @DouweM

  • Douwe Maan resolved all discussions

    resolved all discussions

  • Douwe Maan approved this merge request

    approved this merge request

  • Douwe Maan mentioned in commit 99852965

    mentioned in commit 99852965

  • Douwe Maan merged

    merged

  • Sean McGivern changed title from Add setting to collapse outdated diff comments on push to Add setting to resolve outdated diff comments on push

    changed title from Add setting to collapse outdated diff comments on push to Add setting to resolve outdated diff comments on push

  • Sean McGivern changed the description

    changed the description

  • 🤖 GitLab Bot 🤖 added devopsplan label

    added devopsplan label

    • Please register or sign in to reply