diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-27 10:18:40 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-27 10:18:48 +0000 |
| commit | 1ef777bffd5e64ea5764920a30998a4d7c5241e3 (patch) | |
| tree | 805a35dfcb8b14a2c980a9f183929c4a67ff61a7 /lib | |
| parent | eff560cfb9a337623d25b912d9bb233fae25fbf1 (diff) | |
| download | gitlab-ce-1ef777bffd5e64ea5764920a30998a4d7c5241e3.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@14-4-stable-ee
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/applications.rb | 2 | ||||
| -rw-r--r-- | lib/api/project_import.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/api/applications.rb b/lib/api/applications.rb index be482272b20..346bd6ccfe4 100644 --- a/lib/api/applications.rb +++ b/lib/api/applications.rb @@ -15,7 +15,7 @@ module API params do requires :name, type: String, desc: 'Application name' requires :redirect_uri, type: String, desc: 'Application redirect URI' - requires :scopes, type: String, desc: 'Application scopes' + requires :scopes, type: String, desc: 'Application scopes', allow_blank: false optional :confidential, type: Boolean, default: true, desc: 'Application will be used where the client secret is confidential' diff --git a/lib/api/project_import.rb b/lib/api/project_import.rb index d43184ff75d..e7c532e2483 100644 --- a/lib/api/project_import.rb +++ b/lib/api/project_import.rb @@ -9,6 +9,8 @@ module API feature_category :importers + before { authenticate! unless route.settings[:skip_authentication] } + helpers do def import_params declared_params(include_missing: false) @@ -109,6 +111,7 @@ module API detail 'This feature was introduced in GitLab 10.6.' success Entities::ProjectImportStatus end + route_setting :skip_authentication, true get ':id/import' do present user_project, with: Entities::ProjectImportStatus end |