Skip to content

Revise UI messages for invalid merge requests

Amy Qualls requested to merge aqualls-invalid-mr-message into master

What does this MR do?

Intends to revise the messages in app/views/projects/merge_requests/invalid.html.haml when merge requests just can't load, due to edge cases like:

  • Fork is gone.
  • Target branch is gone.
  • Source branch is gone.
  • $some_other_failure

The HAML is a mishmash of variables and text, and I can't figure out how to edit it locally + get the changes to pass haml-lint. I expect I'll need to provide the messages here in a comment, and then ask some sweetheart of a frontend engineer to reverse-engineer the text back into the HAML file, because this one's beyond me.

Proposed new message stem + endings

Can't show this merge request because

  • the fork project was removed. (TBD: next step?)
  • the source branch $x is missing from project $y. Close this merge request or update the source branch.
  • the target branch $x is missing from project $y. Close this merge request or update the target branch.
  • of an internal error. (TBD: next step?)

Related issues

  • Related to &6436 where we're polishing all UI messages related to merge requests.
  • Related to #346053 (closed) because it's gonna land in 14.6!

Author's checklist

If you are only adding documentation, do not add any of the following labels:

  • ~"type::feature"
  • ~"frontend"
  • ~"backend"
  • ~"type::bug"
  • ~"database"

These labels cause the MR to be added to code verification QA issues.

Review checklist

Documentation-related MRs should be reviewed by a Technical Writer for a non-blocking review, based on Documentation Guidelines and the Style Guide.

  • If the content requires it, ensure the information is reviewed by a subject matter expert.
  • Technical writer review items:
    • Ensure docs metadata is present and up-to-date.
    • Ensure the appropriate labels are added to this MR.
    • If relevant to this MR, ensure content topic type principles are in use, including:
      • The headings should be something you'd do a Google search for. Instead of Default behavior, say something like Default behavior when you close an issue.
      • The headings (other than the page title) should be active. Instead of Configuring GDK, say something like Configure GDK.
      • Any task steps should be written as a numbered list.
      • If the content still needs to be edited for topic types, you can create a follow-up issue with the docs-technical-debt label.
  • Review by assigned maintainer, who can always request/require the above reviews. Maintainer's review can occur before or after a technical writer review.
  • Ensure a release milestone is set.
Edited by Amy Qualls

Merge request reports