Skip to content
Snippets Groups Projects
Verified Commit dfb7a0fc authored by Andrew Fontaine's avatar Andrew Fontaine Committed by GitLab
Browse files

Merge branch '452177-update-selector-wording' into 'master'

Adjust trial wording for the group selector dropdown

See merge request !148037



Merged-by: Andrew Fontaine's avatarAndrew Fontaine <afontaine@gitlab.com>
Approved-by: default avatarRoy Liu <rliu@gitlab.com>
Approved-by: Andrew Fontaine's avatarAndrew Fontaine <afontaine@gitlab.com>
Co-authored-by: Doug Stull's avatarDoug Stull <dstull@gitlab.com>
parents cebc5240 fc3e7b5d
No related branches found
No related tags found
1 merge request!148037Adjust trial wording for the group selector dropdown
Pipeline #1232454122 passed
Pipeline: E2E Omnibus GitLab EE

#1232524565

    Pipeline: E2E CNG

    #1232458431

      Pipeline: GitLab

      #1232458407

        +29
        ......@@ -7,7 +7,7 @@ export const CREATE_GROUP_OPTION_VALUE = '0';
        export default {
        i18n: {
        groupSelectLabel: __('This subscription is for'),
        groupSelectLabel: __('This trial is for'),
        defaultToggleText: __('Please select a group'),
        newGroupNameLabel: __('New group name'),
        },
        ......
        ......@@ -191,12 +191,12 @@
        def expect_to_be_on_namespace_creation
        expect(page).to have_content('New group name')
        expect(page).to have_content('Who will be using GitLab?')
        expect(page).not_to have_content('This subscription is for')
        expect(page).not_to have_content('This trial is for')
        end
        def expect_to_be_on_namespace_creation_without_company_question
        expect(page).to have_content('New group name')
        expect(page).not_to have_content('Who will be using GitLab?')
        expect(page).not_to have_content('This subscription is for')
        expect(page).not_to have_content('This trial is for')
        end
        end
        ......@@ -21,13 +21,13 @@ def expect_to_be_on_namespace_selection_with_errors
        end
        def expect_to_be_on_namespace_selection
        expect(page).to have_content('This subscription is for')
        expect(page).to have_content('This trial is for')
        expect(page).to have_content('Who will be using GitLab?')
        end
        def expect_to_have_namespace_creation_errors(group_name: '_invalid group name_', error_message: 'Group URL can')
        within('[data-testid="trial-form"]') do
        expect(page).not_to have_content('This subscription is for')
        expect(page).not_to have_content('This trial is for')
        expect(page.find_field('new_group_name').value).to eq(group_name)
        expect(page).to have_content(error_message)
        end
        ......
        ......@@ -52390,15 +52390,15 @@ msgstr ""
        msgid "This setting is allowed for forked projects only"
        msgstr ""
         
        msgid "This subscription is for"
        msgstr ""
        msgid "This suggestion already matches its content."
        msgstr ""
         
        msgid "This title already exists."
        msgstr ""
         
        msgid "This trial is for"
        msgstr ""
        msgid "This user cannot be unlocked manually from GitLab"
        msgstr ""
         
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment