Skip to content

Update locked issuable text

Austin Regnery requested to merge aregnery/update-locked-discussion-text into master

What does this MR do and why?

The locking feature is described in docs as a tool to lock discussions. This change aligns the product to our documentation and improves the UI text.

Closes #28182 (closed) & #411307 (closed)

Screenshots or screen recordings

Before After
Issue vs Merge request

CleanShot 2023-11-01 at 13.38.37.png

CleanShot 2023-11-01 at 13.29.19.png
Issue dropdown

CleanShot 2023-11-01 at 13.39.53.pngCleanShot 2023-11-01 at 13.40.13.pngCleanShot 2023-11-01 at 13.40.15.pngCleanShot 2023-11-01 at 17.04.25.png

CleanShot 2023-11-01 at 13.41.56.pngCleanShot 2023-11-01 at 13.41.51.pngCleanShot 2023-11-01 at 13.42.25.pngCleanShot 2023-11-01 at 17.07.37.png
Merge request dropdown

CleanShot 2023-11-01 at 13.45.54.pngCleanShot 2023-11-01 at 17.05.06.png

CleanShot 2023-11-01 at 13.45.50.pngCleanShot 2023-11-01 at 13.45.52.png

CleanShot 2023-11-01 at 13.44.32.png

CleanShot 2023-11-01 at 13.44.42.png

CleanShot 2023-11-01 at 13.44.50.png

CleanShot 2023-11-01 at 17.06.55.png
Issue activity log

CleanShot 2023-11-01 at 13.48.17.png

CleanShot 2023-11-01 at 13.48.27.png
Merge request activity log

CleanShot 2023-11-01 at 13.49.27.png

CleanShot 2023-11-01 at 13.49.33.png
Issue comment warning

CleanShot 2023-11-01 at 17.01.12.png

CleanShot 2023-11-01 at 17.00.08.png
Confidential issue

CleanShot 2023-11-01 at 17.18.43.png

CleanShot 2023-11-01 at 17.17.06.png
Merge request comment warning

CleanShot 2023-11-01 at 13.50.08.png

CleanShot 2023-11-01 at 16.59.38.png
Issue tooltip

CleanShot 2023-11-01 at 17.01.52.png

CleanShot 2023-11-01 at 17.11.20.png
Merge request tooltip

CleanShot 2023-11-01 at 17.02.01.png

CleanShot 2023-11-01 at 17.11.49.png

Merge request sidebar disable :moved_mr_sidebar

CleanShot 2023-11-01 at 17.35.39.pngCleanShot 2023-11-01 at 17.33.41.png

CleanShot 2023-11-01 at 17.32.00.png

CleanShot 2023-11-01 at 17.32.08.png

CleanShot 2023-11-01 at 17.47.50.png

CleanShot 2023-11-01 at 17.48.29.png

CleanShot 2023-11-01 at 17.47.44.png

CleanShot 2023-11-01 at 17.48.39.png

Quick action (no change)

CleanShot 2023-11-01 at 18.00.48.png

CleanShot 2023-11-01 at 18.01.19.png

CleanShot 2023-11-01 at 17.58.12.png

CleanShot 2023-11-01 at 17.57.56.png

Flash alert (no change)

CleanShot 2023-11-01 at 18.01.03.pngCleanShot 2023-11-01 at 18.02.11.png

CleanShot 2023-11-01 at 18.01.03.pngCleanShot 2023-11-01 at 18.02.11.png
Toast message (issues)

CleanShot 2023-11-01 at 18.02.50.png

CleanShot 2023-11-01 at 18.02.57.png

CleanShot 2023-11-01 at 18.05.04.png

CleanShot 2023-11-01 at 18.04.41.png
Toast message (merge requests)

CleanShot 2023-11-01 at 18.06.38.png

CleanShot 2023-11-01 at 18.06.25.png

CleanShot 2023-11-01 at 18.04.05.png

CleanShot 2023-11-01 at 18.03.57.png

How to set up and validate locally

  1. Lock and unlock a public and confidential issue / merge request
  2. View the button in the dropdown and it's loading state with the spinner
  3. View the toast message.
  4. View the tooltip by hovering over the locked badge in the header
  5. View the activity log messaging
  6. View the warning message above the comment text area under different conditions
  7. You'll need to disable the feature flag :moved_mr_sidebar to make the merge request sidebar appear

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Edited by Austin Regnery

Merge request reports