diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-27 13:18:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-27 13:18:37 +0300 |
commit | 0a9edaf533931d62656ac1e8c306a9d17a088538 (patch) | |
tree | a970dfeda99bd81d64fa7f75fcbd621364f9f1cd /lib/api | |
parent | a1f4b49da7b0e70938730b30575453459eb6dfd5 (diff) |
Add latest changes from gitlab-org/security/gitlab@14-3-stable-ee
Diffstat (limited to 'lib/api')
-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 039f7b4be41..6e9b7fe4ce3 100644 --- a/lib/api/project_import.rb +++ b/lib/api/project_import.rb @@ -10,6 +10,8 @@ module API feature_category :importers + before { authenticate! unless route.settings[:skip_authentication] } + helpers do def import_params declared_params(include_missing: false) @@ -110,6 +112,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 |