Merge branch 'georgekoltsov/update-github-importer-page' into 'master'

Update github importer PAT text for ci_cd_only projects

See merge request gitlab-org/gitlab!16453

ee/app/helpers/ee/import_helper.rb

@@ -70,11 +70,7 @@ module EE
       if has_ci_cd_only_params?
         personal_access_token_link = link_to _('Personal Access Token'), 'https://github.com/settings/tokens'
 
-        if github_import_configured?
-          _('Alternatively, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to connect.').html_safe % { personal_access_token_link: personal_access_token_link }
-        else
-          _('To connect GitHub repositories, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to connect.').html_safe % { personal_access_token_link: personal_access_token_link }
-        end
+        _('To connect GitHub repositories, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to connect.').html_safe % { personal_access_token_link: personal_access_token_link }
       else
         super
       end

ee/changelogs/unreleased/georgekoltsov-update-github-importer-page.yml

+---
+title: Update GitHub Importer Personal Access Token field description for CI/CD projects
+  only to reflect latest OAuth changes
+merge_request: 16453
+author:
+type: fixed

locale/gitlab.pot

@@ -1321,9 +1321,6 @@ msgstr ""
 msgid "Alternate support URL for help page and help dropdown"
 msgstr ""
 
-msgid "Alternatively, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to connect."
-msgstr ""
-
 msgid "Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication"
 msgstr ""