Skip to content
Snippets Groups Projects

Fix overlapping titles in wiki sidebar navigation

Merged John Hope requested to merge jh-backport-124985 into 16-1-stable-ee
All threads resolved!

What does this MR do and why?

This MR backports Revert "Merge branch 'fix-item-height-in-wiki-s... (!124869 - merged) and Set a min-height for wiki list items (!124985 - merged) to %16.0 for inclusion in the patch release.

Fixing the height of Wiki sidebar components without implementing any further styling (i.e. word breaks, whitespace, text-overflow) leads to significant navigation issues with overlapping page titles. See Wiki titles on the sidebar overlap if they reac... (#412894 - closed).

This MR introduces min-height instead of an absolute height. This keeps the solution for the original problem of buttons overrunning the height of the list-item, without setting a fixed width that causes navigation to break for titles longer than 1 line.

MR acceptance checklist

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

  • This MR is backporting a bug fix, documentation update, or spec fix, previously merged in the default branch.
  • The original MR has been deployed to GitLab.com (not applicable for documentation or spec changes).
  • This MR has a severity label assigned (if applicable).
  • This MR has been approved by a maintainer (only one approval is required).
  • Ensure the e2e:package-and-test-ee job has either succeeded or been approved by a Software Engineer in Test.

Note to the merge request author and maintainer

If you have questions about the patch release process, please:

Edited by John Hope

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
  • John Hope changed milestone to %16.1

    changed milestone to %16.1

  • assigned to @johnhope

  • A deleted user added frontend label

    added frontend label

  • Contributor
    2 Warnings
    :warning: You've made some app changes, but didn't add any tests.
    That's OK as long as you're refactoring existing code,
    but please consider adding any of the maintenancepipelines, maintenancerefactor, maintenanceworkflow, documentation, QA labels.
    :warning: The e2e:package-and-test-ee job needs to succeed or have approval from a Software Engineer in Test.
    Read the "QA e2e:package-and-test-ee" section for more details.

    Reviewer roulette

    Changes that require review have been detected!

    Please refer to the table below for assigning reviewers and maintainers suggested by Danger in the specified category:

    Category Reviewer Maintainer
    frontend Paulina Sedlak-Jakubowska current availability (@psjakubowska) (UTC+2, 1 hour ahead of @johnhope) Paul Slaughter current availability (@pslaughter) (UTC-5, 6 hours behind @johnhope)

    To spread load more evenly across eligible reviewers, Danger has picked a candidate for each review slot, based on their timezone. Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.

    To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.

    Once you've decided who will review this merge request, assign them as a reviewer! Danger does not automatically notify them for you.

    QA e2e:package-and-test-ee

    @johnhope, the package-and-test job must complete before merging this merge request.*

    If there are failures on the package-and-test pipeline, ping your team's associated Software Engineer in Test (SET) to confirm the failures are unrelated to the merge request. If there's no SET assigned, ask for assistance on the #quality Slack channel.

    If needed, you can retry the :repeat: danger-review job that generated this comment.

    Generated by :no_entry_sign: Danger

  • Contributor

    Allure report

    allure-report-publisher generated test report!

    e2e-test-on-gdk: :exclamation: test report for 5a360319

    expand test summary
    +-----------------------------------------------------------------------+
    |                            suites summary                             |
    +------------------+--------+--------+---------+-------+-------+--------+
    |                  | passed | failed | skipped | flaky | total | result |
    +------------------+--------+--------+---------+-------+-------+--------+
    | Create           | 8      | 0      | 1       | 6     | 9     | ❗     |
    | Govern           | 2      | 0      | 0       | 0     | 2     | ✅     |
    | Data Stores      | 2      | 0      | 0       | 0     | 2     | ✅     |
    | Monitor          | 4      | 0      | 0       | 4     | 4     | ❗     |
    | Manage           | 1      | 0      | 0       | 0     | 1     | ✅     |
    | Framework sanity | 0      | 0      | 1       | 0     | 1     | ➖     |
    | Plan             | 4      | 0      | 0       | 4     | 4     | ❗     |
    +------------------+--------+--------+---------+-------+-------+--------+
    | Total            | 21     | 0      | 2       | 14    | 23    | ❗     |
    +------------------+--------+--------+---------+-------+-------+--------+

    e2e-review-qa: :exclamation: test report for 5a360319

    expand test summary
    +-----------------------------------------------------------------------+
    |                            suites summary                             |
    +------------------+--------+--------+---------+-------+-------+--------+
    |                  | passed | failed | skipped | flaky | total | result |
    +------------------+--------+--------+---------+-------+-------+--------+
    | Plan             | 50     | 0      | 1       | 0     | 51    | ✅     |
    | Create           | 8      | 0      | 1       | 1     | 9     | ❗     |
    | Govern           | 2      | 0      | 0       | 0     | 2     | ✅     |
    | Manage           | 1      | 0      | 0       | 0     | 1     | ✅     |
    | Framework sanity | 0      | 0      | 1       | 0     | 1     | ➖     |
    | Data Stores      | 2      | 0      | 0       | 0     | 2     | ✅     |
    | Monitor          | 4      | 0      | 0       | 0     | 4     | ✅     |
    +------------------+--------+--------+---------+-------+-------+--------+
    | Total            | 67     | 0      | 3       | 1     | 70    | ❗     |
    +------------------+--------+--------+---------+-------+-------+--------+

    e2e-package-and-test: :exclamation: test report for 5a360319

    expand test summary
    +-----------------------------------------------------------------------+
    |                            suites summary                             |
    +------------------+--------+--------+---------+-------+-------+--------+
    |                  | passed | failed | skipped | flaky | total | result |
    +------------------+--------+--------+---------+-------+-------+--------+
    | Plan             | 318    | 0      | 3       | 0     | 321   | ✅     |
    | Create           | 150    | 0      | 20      | 1     | 170   | ❗     |
    | Framework sanity | 0      | 0      | 2       | 0     | 2     | ➖     |
    | Monitor          | 8      | 0      | 0       | 0     | 8     | ✅     |
    | Data Stores      | 4      | 0      | 0       | 0     | 4     | ✅     |
    | Govern           | 4      | 0      | 0       | 0     | 4     | ✅     |
    | Manage           | 2      | 0      | 0       | 0     | 2     | ✅     |
    +------------------+--------+--------+---------+-------+-------+--------+
    | Total            | 486    | 0      | 25      | 1     | 511   | ❗     |
    +------------------+--------+--------+---------+-------+-------+--------+
  • John Hope marked the checklist item Ensure the e2e:package-and-test-ee job has either succeeded or been approved by a Software Engineer in Test. as completed

    marked the checklist item Ensure the e2e:package-and-test-ee job has either succeeded or been approved by a Software Engineer in Test. as completed

  • Author Developer

    @pslaughter The e2e:package-and-test-ee job ran as part of the pipeline and exited successfully. Would you mind reviewing and merging this MR please? Only maintainer approval is required.

  • John Hope requested review from @pslaughter

    requested review from @pslaughter

  • Tested a bit locally and everything seems to work as expected :thumbsup: Changes LGTM :thumbsup:

    lgtm

    Approving and per the runbook, setting MWPS :eyes:

  • Paul Slaughter approved this merge request

    approved this merge request

    • Resolved by Paul Slaughter

      :wave: @pslaughter, thanks for approving this merge request.

      This is the first time the merge request is approved. Please ensure the e2e:package-and-test-ee job has succeeded. If there is a failure, a Software Engineer in Test (SET) needs to confirm the failures are unrelated to the merge request. If there's no SET assigned to this team, ask for assistance on the #quality Slack channel.

  • Paul Slaughter resolved all threads

    resolved all threads

  • Paul Slaughter enabled an automatic merge when the pipeline for e2f312e2 succeeds

    enabled an automatic merge when the pipeline for e2f312e2 succeeds

  • Paul Slaughter mentioned in commit 18973c78

    mentioned in commit 18973c78

  • merged

  • John Hope mentioned in merge request !115929 (merged)

    mentioned in merge request !115929 (merged)

Please register or sign in to reply
Loading