diff options
author | Scott Hampton <shampton@gitlab.com> | 2019-08-23 02:20:19 +0300 |
---|---|---|
committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-08-23 02:20:19 +0300 |
commit | 56294b4ea9b0a2054423c895b9a7667118cda0ad (patch) | |
tree | b6108a6008bb486e13d61aa2150bbb1b97fff4fd /app/helpers/import_helper.rb | |
parent | ba67965ac5386164a38acda32ff4e547e61b0376 (diff) |
Update GitHub CI/CD import page to use PAT only
Oauth2 tokens are causing issues with mirroring
repos, because it effectively limits the number
of repos you can mirror. Personal Access
Tokens do not have this problem.
This change removes the OAuth2 option from
the import page for CI/CD only, and only
provides the personal access token form.
Diffstat (limited to 'app/helpers/import_helper.rb')
-rw-r--r-- | app/helpers/import_helper.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/app/helpers/import_helper.rb b/app/helpers/import_helper.rb index 3d494c3de6a..9122ad5b35a 100644 --- a/app/helpers/import_helper.rb +++ b/app/helpers/import_helper.rb @@ -45,17 +45,14 @@ module ImportHelper end def import_github_authorize_message - _('To import GitHub repositories, you first need to authorize GitLab to access the list of your GitHub repositories:') + _('To connect GitHub repositories, you first need to authorize GitLab to access the list of your GitHub repositories.') end def import_github_personal_access_token_message - personal_access_token_link = link_to _('Personal Access Token'), 'https://github.com/settings/tokens' + link_url = 'https://github.com/settings/tokens' + link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: link_url } - 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 import.').html_safe % { personal_access_token_link: personal_access_token_link } - else - _('To import 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 import.').html_safe % { personal_access_token_link: personal_access_token_link } - end + _('Create and provide your GitHub %{link_start}Personal Access Token%{link_end}. 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 import.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe } end def import_configure_github_admin_message |