diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-19 14:01:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-19 14:01:45 +0300 |
| commit | 9297025d0b7ddf095eb618dfaaab2ff8f2018d8b (patch) | |
| tree | 865198c01d1824a9b098127baa3ab980c9cd2c06 /app/controllers/concerns/import/github_oauth.rb | |
| parent | 6372471f43ee03c05a7c1f8b0c6ac6b8a7431dbe (diff) | |
Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42
Diffstat (limited to 'app/controllers/concerns/import/github_oauth.rb')
| -rw-r--r-- | app/controllers/concerns/import/github_oauth.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/concerns/import/github_oauth.rb b/app/controllers/concerns/import/github_oauth.rb index ae5a0401155..fa6162254dc 100644 --- a/app/controllers/concerns/import/github_oauth.rb +++ b/app/controllers/concerns/import/github_oauth.rb @@ -56,7 +56,11 @@ module Import session[:auth_on_failure_path] = "#{new_project_path}#import_project" oauth_client.auth_code.authorize_url( redirect_uri: callback_import_url, - scope: 'repo, user, user:email', + # read:org only required for collaborator import, which is optional, + # but at the time of this OAuth request we do not know which optional + # configuration the user will select because the options are only shown + # after authenticating + scope: 'repo, read:org', state: state ) end |