Skip to content
Snippets Groups Projects

Update MR form to use plural field names

1 unresolved thread

Issue #244835 (closed)

What does this MR do?

Pluralize Assignee and Reviewer in MR form

Testing Case

  1. Go to a Merge Request and click "edit".

In the free tier, it will display the singular wording. In the paid tier, it will display the plural wording, irrespective of the size.

Paid ( <= 1) Paid ( > 1) Free
image image image

Note

This change will also affect the Issues form page. Example:

Screenshots

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team

Closes #244835 (closed)

Closes #244835 (closed)

Edited by Samantha Ming

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

    @sming-gitlab and @pedroms

    I guess I'm a. bit confused on who to ping. I saw @pedroms opened the original MR but is @sming-gitlab owning the MR now?

    Left some feedback either way :ping_pong:

    Edited by -
    • Resolved by Pedro Moreira da Silva

      @sming-gitlab maybe I should have explained myself more clearly, but the intention here was to differentiate tiers where only one assignee/reviewer is allowed vs multiple assignees/reviewers. That's why I said in !41402 (comment 407006301):

      So it should read Assignee in Core and Assignees in Starter+

      1. Core: Assignee and Reviewer
      2. Starter+: Assignees and Reviewers

      So the pluralization of the field label is not dependent on the number of entries in that field, but rather on the what is allowed in that tier. So in Starter+, even if there are no assignees or just 1 assignee, the field label is Assignees because it allows for multiple assignees. Does that make sense?

  • Samantha Ming changed title from Resolve "Update MR form to use plural field names" to Update MR form to use plural field names

    changed title from Resolve "Update MR form to use plural field names" to Update MR form to use plural field names

  • Samantha Ming changed the description

    changed the description

  • Samantha Ming assigned to @pedroms and unassigned @farias-gl

    assigned to @pedroms and unassigned @farias-gl

  • Samantha Ming added 839 commits

    added 839 commits

    Compare with previous version

  • Samantha Ming added 1 commit

    added 1 commit

    • b6f81dc7 - Plural form always for paid tiers

    Compare with previous version

    • Contributor
      Resolved by Jose Ivan Vargas

      @sming-gitlab did another review, but wasn't sure if you wanted one. I saw the pings, but please re-assign to me in the future to indicate future reviews.

      Left some minor notes, but otherwise looks good!

  • Samantha Ming added 1 commit

    added 1 commit

    • 51cea8da - Plural form always for paid tiers

    Compare with previous version

  • Samantha Ming changed the description

    changed the description

  • mentioned in issue #267761 (closed)

  • Samantha Ming added 340 commits

    added 340 commits

    Compare with previous version

  • Samantha Ming added 1 commit

    added 1 commit

    • f47db1e0 - Plural form always for paid tiers

    Compare with previous version

  • Samantha Ming added 1 commit

    added 1 commit

    • 7277c84e - Plural form always for paid tiers

    Compare with previous version

  • assigned to @jivanvl

  • 36 36 end
    37 37
    38 38 it 'allows user to select unassigned' do
    39 stub_licensed_features(multiple_issue_assignees: false)
    • Suggestion I'm not sure how the test team does this, but, I think it might be a good idea to create a follow up to add the missing rspec scenarios for when this feature flag is set to true

      Perhaps this is worthy of sending for review with a backend or test engineer?

    • @jivanvl That's a good call! Yes, let's not rush this MR for this sprint then :persevere: Let me add more feature specs for the scenario you suggested and then get the QA to review it. Will ping you once it's ready again! Thanks again for being so prompt on this review :pray:

    • changed this line in version 9 of the diff

    • @jivanvl Finally have time to get back to this MR :sweat_smile: I made a few tiny adjustments to the spec after reading our docs > https://docs.gitlab.com/ee/development/feature_flags/development.html#feature-flags-in-tests

      It is strongly advised to test all code affected by a feature flag, both when enabled and disabled to ensure the feature works properly.

      When using the testing environment, all feature flags are enabled by default.

      So that means by default, our FF is enabled. So I should adjust the current test to suit this and then ADD a test when it is disabled. (This approach also makes more sense to me, cause we are future-proofing when the FE is enabled by default and then finally becoming the norm of our codebase).

      Anyways, let me know if this approach makes sense, sending it back to you :ping_pong:

    • @sming-gitlab That makes sense unfortunately without the feature flag this is causing a legitimate error in gitlab-foss, so I think it is necessary to have the feature flag set on and off. Also you have rubocop issue :sweat_smile:

      Do let me know if you want to pair to try and address the spec failures :thumbsup: looking pretty solid so far

    • @jivanvl I just realized this is a license thing NOT feature flag :sweat_smile: And I ended up returning to my original route. Although it passed locally, our pipeline seemed not to like it. I think it's because the spec is not inside the ee folder. So I created the ee related spec inside the ee directory. It's passing now, sending it back to you :ping_pong:

    • Although it passed locally, our pipeline seemed not to like it

      FYI this was because our pipeline runs both FOSS and non-FOSS environments. Your test passed on non-FOSS because the license exists there, but on FOSS there's no such thing as a license, and all the code inside ee doesn't even exist, so the flag check defaulted to false.

      Moving this to the ee area was the right call :thumbsup:

    • @mdelaossa OH, that's what it is:bulb: Thanks for clearing that up for me!! Phew, luckily I made the right call, was really pulling my hair out on that one :joy:

    • Please register or sign in to reply
  • Samantha Ming changed milestone to %13.6

    changed milestone to %13.6

  • - approved this merge request

    approved this merge request

  • Contributor

    @sming-gitlab frontend looks good to me! Approved

    Edited by -
  • Samantha Ming added 5803 commits

    added 5803 commits

    Compare with previous version

  • Samantha Ming added 186 commits

    added 186 commits

    Compare with previous version

  • Samantha Ming added 1 commit

    added 1 commit

    Compare with previous version

  • Samantha Ming added 1 commit

    added 1 commit

    Compare with previous version

  • Samantha Ming added 1 commit

    added 1 commit

    Compare with previous version

  • Samantha Ming added 1 commit

    added 1 commit

    Compare with previous version

  • Samantha Ming added 1 commit

    added 1 commit

    Compare with previous version

  • 🤖 GitLab Bot 🤖 changed milestone to %13.7

    changed milestone to %13.7

  • Samantha Ming added 164 commits

    added 164 commits

    Compare with previous version

  • assigned to @jivanvl

  • Jose Ivan Vargas approved this merge request

    approved this merge request

  • Mario de la Ossa approved this merge request

    approved this merge request

  • Jose Ivan Vargas resolved all threads

    resolved all threads

  • Thanks @sming-gitlab this looks good to me!

  • Jose Ivan Vargas enabled an automatic merge when the pipeline for 36f233ee succeeds

    enabled an automatic merge when the pipeline for 36f233ee succeeds

  • mentioned in commit c0026bcf

  • added workflowcanary label and removed workflowstaging label

  • added workflowproduction label and removed workflowcanary label

  • mentioned in issue #244835 (closed)

  • Please register or sign in to reply
    Loading