Skip to content
Snippets Groups Projects

Include double colon inside the translation

Merged Savas Vedova requested to merge 413947-avoid-sentence-splitting into master
All threads resolved!

What does this MR do and why?

Some languages treat the double colon differently, therefore it needs to be part of the translation. This MR includes the double colon inside the translation.

Changelog: changed EE: true

Screenshots or screen recordings

No visual changes.

How to set up and validate locally

  1. Fork https://gitlab.com/gitlab-examples/security/security-reports/
  2. Run a pipeline against the default branch. It will generate vulnerabilities.
  3. Click on Secure > Vulnerability Report
  4. Change the status of a vulnerability (use the checkbox next to the vulnerability to have the status selector displayed)
  5. Check the translation in the popper

MR acceptance checklist

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

Related to #413947 (closed)

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
  • Contributor
    1 Warning
    :warning: This merge request contains lines with testid selectors. Please ensure e2e:package-and-test job is run.

    Testid Selectors

    The following changed lines in this MR contain testid selectors:

    • file ee/app/assets/javascripts/vulnerabilities/components/status_description.vue:
      •    <span :class="{ 'gl-font-weight-bold': isStatusBolded }" data-testid="status">
      •    <span :class="{ 'gl-font-weight-bold': isStatusBolded }" data-testid="status">{{
      •    <span :class="{ 'gl-font-weight-bold': isStatusBolded }" data-testid="dismissal-reason">
    • file ee/spec/frontend/vulnerabilities/status_description_spec.js:
      • const statusEl = () => wrapper.find('[data-testid="status"]');

    If the e2e:package-and-test job in the qa stage has run automatically, please ensure the tests are passing. If the job has not run, please start the trigger-omnibus-and-follow-up-e2e job in the qa stage and ensure the tests in follow-up-e2e:package-and-test-ee pipeline are passing.

    For the list of known failures please refer to the latest pipeline triage issue.

    If your changes are under a feature flag, please check our Testing with feature flags documentation for instructions.

    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 Sam Beckham current availability (@samdbeckham) (UTC+1, 1 hour behind @svedova) Paul Slaughter current availability (@pslaughter) (UTC-5, 7 hours behind @svedova)

    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.

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

    Generated by :no_entry_sign: Danger

  • mentioned in issue #413947 (closed)

  • Contributor

    Bundle size analysis [beta]

    This compares changes in bundle size for entry points between the commits 806d8f03 and f469756d

    :sparkles: Special assets

    Entrypoint / Name Size before Size after Diff Diff in percent
    average 4.17 MB 4.17 MB - 0.0 %
    mainChunk 3.02 MB 3.02 MB - 0.0 %

    Note: We do not have exact data for 806d8f03. So we have used data from: 43100421.
    The target commit was too new, so we used the latest commit from master we have info on.
    It might help to rerun the bundle-size-review job
    This might mean that you have a few false positives in this report. If something unrelated to your code changes is reported, you can check this comparison in order to see if they caused this change.

    Please look at the full report for more details


    Read more about how this report works.

    Generated by :no_entry_sign: Danger

    • Contributor
      Resolved by Savas Vedova

      @svedova Some end-to-end (E2E) tests should run based on the stage label.

      Please start the trigger-omnibus-and-follow-up-e2e job in the qa stage and ensure tests in the follow-up-e2e:package-and-test-ee pipeline pass before this MR is merged. (E2E tests are computationally intensive and don't run automatically for every push/rebase, so we ask you to run this job manually at least once.)

      To run all E2E tests, apply the pipeline:run-all-e2e label and run a new pipeline.

      E2E test jobs are allowed to fail due to flakiness. See current failures at the latest pipeline triage issue.

      Once done, apply the :white_check_mark: emoji on this comment.

      For any questions or help, reach out on the internal #quality Slack channel.

  • Contributor

    Allure report

    allure-report-publisher generated test report!

    e2e-test-on-gdk: :exclamation: test report for f469756d

    expand test summary
    +-----------------------------------------------------------------------+
    |                            suites summary                             |
    +------------------+--------+--------+---------+-------+-------+--------+
    |                  | passed | failed | skipped | flaky | total | result |
    +------------------+--------+--------+---------+-------+-------+--------+
    | Govern           | 36     | 0      | 0       | 0     | 36    | ✅     |
    | Framework sanity | 0      | 0      | 1       | 0     | 1     | ➖     |
    | Create           | 46     | 0      | 1       | 2     | 47    | ❗     |
    | Monitor          | 4      | 0      | 0       | 0     | 4     | ✅     |
    | Plan             | 51     | 0      | 0       | 0     | 51    | ✅     |
    | Verify           | 8      | 0      | 0       | 0     | 8     | ✅     |
    | Data Stores      | 22     | 0      | 0       | 0     | 22    | ✅     |
    | Manage           | 13     | 0      | 1       | 1     | 14    | ❗     |
    | Package          | 0      | 0      | 1       | 0     | 1     | ➖     |
    +------------------+--------+--------+---------+-------+-------+--------+
    | Total            | 180    | 0      | 4       | 3     | 184   | ❗     |
    +------------------+--------+--------+---------+-------+-------+--------+

    e2e-review-qa: :exclamation: test report for f469756d

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

    e2e-package-and-test: :exclamation: test report for f469756d

    expand test summary
    +-----------------------------------------------------------------------+
    |                            suites summary                             |
    +------------------+--------+--------+---------+-------+-------+--------+
    |                  | passed | failed | skipped | flaky | total | result |
    +------------------+--------+--------+---------+-------+-------+--------+
    | Verify           | 141    | 0      | 15      | 0     | 156   | ✅     |
    | Data Stores      | 117    | 0      | 3       | 0     | 120   | ✅     |
    | Govern           | 167    | 0      | 3       | 6     | 170   | ❗     |
    | Plan             | 246    | 0      | 10      | 0     | 256   | ✅     |
    | Create           | 559    | 0      | 89      | 52    | 648   | ❗     |
    | Systems          | 8      | 0      | 0       | 0     | 8     | ✅     |
    | Release          | 18     | 0      | 0       | 0     | 18    | ✅     |
    | Package          | 226    | 0      | 17      | 0     | 243   | ✅     |
    | Manage           | 158    | 0      | 13      | 25    | 171   | ❗     |
    | GitLab Metrics   | 2      | 0      | 1       | 0     | 3     | ✅     |
    | Analytics        | 7      | 0      | 0       | 0     | 7     | ✅     |
    | Monitor          | 36     | 0      | 7       | 0     | 43    | ✅     |
    | Fulfillment      | 8      | 0      | 72      | 0     | 80    | ✅     |
    | Configure        | 1      | 0      | 9       | 0     | 10    | ✅     |
    | Secure           | 6      | 0      | 12      | 0     | 18    | ✅     |
    | Framework sanity | 0      | 0      | 5       | 0     | 5     | ➖     |
    | Growth           | 0      | 0      | 6       | 0     | 6     | ➖     |
    | ModelOps         | 0      | 0      | 6       | 0     | 6     | ➖     |
    +------------------+--------+--------+---------+-------+-------+--------+
    | Total            | 1700   | 0      | 268     | 83    | 1968  | ❗     |
    +------------------+--------+--------+---------+-------+-------+--------+
  • Savas Vedova added 1 commit

    added 1 commit

    • f469756d - Implement suggestions from code review

    Compare with previous version

  • requested review from @sming-gitlab

  • Lorenz van Herwaarden approved this merge request

    approved this merge request

  • :wave: @lorenzvanherwaarden, thanks for approving this merge request.

    This is the first time the merge request is approved. To ensure full test coverage, a new pipeline will be started shortly.

    For more info, please refer to the following links:

  • Samantha Ming approved this merge request

    approved this merge request

  • Samantha Ming resolved all threads

    resolved all threads

  • Samantha Ming enabled an automatic merge when the pipeline for 06473af7 succeeds

    enabled an automatic merge when the pipeline for 06473af7 succeeds

  • merged

  • Samantha Ming mentioned in commit 923478ff

    mentioned in commit 923478ff

  • added workflowstaging label and removed workflowcanary label

  • Please register or sign in to reply
    Loading