Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 5 deletions

diff --git a/app/services/container_registry/protection/create_rule_service.rb b/app/services/container_registry/protection/create_rule_service.rb
index 34ec6f42b19..6aa9bd657f6 100644
--- a/app/services/container_registry/protection/create_rule_service.rb
+++ b/app/services/container_registry/protection/create_rule_service.rb
@@ -4,7 +4,7 @@ module ContainerRegistry
   module Protection
     class CreateRuleService < BaseService
       ALLOWED_ATTRIBUTES = %i[
-        container_path_pattern
+        repository_path_pattern
         push_protected_up_to_access_level
         delete_protected_up_to_access_level
       ].freeze
diff --git a/app/services/import/github_service.rb b/app/services/import/github_service.rb
index 86c62145a87..a96bfd74cd0 100644
--- a/app/services/import/github_service.rb
+++ b/app/services/import/github_service.rb
@@ -16,7 +16,7 @@ module Import
       track_access_level('github')
 
       if project.persisted?
-        store_import_settings(project, access_params)
+        store_import_settings(project)
         success(project)
       elsif project.errors[:import_source_disabled].present?
         error(project.errors[:import_source_disabled], :forbidden)
@@ -134,13 +134,12 @@ module Import
       error(translated_message, http_status)
     end
 
-    def store_import_settings(project, access_params)
+    def store_import_settings(project)
       Gitlab::GithubImport::Settings
         .new(project)
         .write(
           timeout_strategy: params[:timeout_strategy] || ProjectImportData::PESSIMISTIC_TIMEOUT,
-          optional_stages: params[:optional_stages],
-          additional_access_tokens: access_params[:additional_access_tokens]
+          optional_stages: params[:optional_stages]
         )
     end
   end