Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 8 insertions, 4 deletions

diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index bb74849a98a..9f0077d23d8 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -91,7 +91,7 @@ module API
       end
 
       def check_import_by_url_is_enabled
-        forbidden! unless Gitlab::CurrentSettings.import_sources&.include?('git')
+        Gitlab::CurrentSettings.import_sources&.include?('git') || forbidden!
       end
     end
 
@@ -269,7 +269,9 @@ module API
         attrs = declared_params(include_missing: false)
         attrs = translate_params_for_compatibility(attrs)
         filter_attributes_using_license!(attrs)
-        check_import_by_url_is_enabled if params[:import_url].present?
+
+        validate_git_import_url!(params[:import_url], import_enabled: check_import_by_url_is_enabled)
+
         project = ::Projects::CreateService.new(current_user, attrs).execute
 
         if project.saved?
@@ -307,6 +309,8 @@ module API
         attrs = declared_params(include_missing: false)
         attrs = translate_params_for_compatibility(attrs)
         filter_attributes_using_license!(attrs)
+        validate_git_import_url!(params[:import_url])
+
         project = ::Projects::CreateService.new(user, attrs).execute
 
         if project.saved?
@@ -400,7 +404,7 @@ module API
         use :collection_params
         use :with_custom_attributes
       end
-      get ':id/forks', feature_category: :source_code_management do
+      get ':id/forks', feature_category: :source_code_management, urgency: :low do
         forks = ForkProjectsFinder.new(user_project, params: project_finder_params, current_user: current_user).execute
 
         present_projects forks, request_scope: user_project
@@ -510,7 +514,7 @@ module API
       end
 
       desc 'Get languages in project repository'
-      get ':id/languages', feature_category: :source_code_management do
+      get ':id/languages', feature_category: :source_code_management, urgency: :medium do
         ::Projects::RepositoryLanguagesService
           .new(user_project, current_user)
           .execute.to_h { |lang| [lang.name, lang.share] }