Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 6 deletions

diff --git a/app/services/ci/job_token_scope/remove_project_service.rb b/app/services/ci/job_token_scope/remove_project_service.rb
index 15644e529d9..d21eff2b619 100644
--- a/app/services/ci/job_token_scope/remove_project_service.rb
+++ b/app/services/ci/job_token_scope/remove_project_service.rb
@@ -5,14 +5,16 @@ module Ci
     class RemoveProjectService < ::BaseService
       include EditScopeValidations
 
-      def execute(target_project)
+      def execute(target_project, direction: :outbound)
         validate_edit!(project, target_project, current_user)
 
         if project == target_project
           return ServiceResponse.error(message: "Source project cannot be removed from the job token scope")
         end
 
-        link = ::Ci::JobToken::ProjectScopeLink.for_source_and_target(project, target_project)
+        link = ::Ci::JobToken::ProjectScopeLink
+          .with_access_direction(direction)
+          .for_source_and_target(project, target_project)
 
         unless link
           return ServiceResponse.error(message: "Target project is not in the job token scope")
diff --git a/app/services/users/build_service.rb b/app/services/users/build_service.rb
index 064bf132d3d..ad2ade19f2b 100644
--- a/app/services/users/build_service.rb
+++ b/app/services/users/build_service.rb
@@ -177,19 +177,17 @@ module Users
 
     # Allowed params for user signup
     def signup_params
-      signup_params = [
+      [
         :email,
         :name,
         :password,
         :password_automatically_set,
+        :preferred_language,
         :username,
         :user_type,
         :first_name,
         :last_name
       ]
-      signup_params << :preferred_language if ::Feature.enabled?(:preferred_language_switcher)
-
-      signup_params
     end
   end
 end