diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-29 01:00:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-29 01:00:32 +0300 |
| commit | 36c8a31d573bdd2edd4c87be63eb8dde20a79761 (patch) | |
| tree | 066a4e64b1efb9c9dabbf3c2e097d32a82656ef8 /app/services | |
| parent | cc201d1e1be2c8f4de2e2265c2b83bd925f8a260 (diff) | |
Add latest changes from gitlab-org/security/gitlab@15-4-stable-ee
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/base_project_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/base_project_service.rb b/app/services/base_project_service.rb index 1bf4a235a79..8cb6b632a9e 100644 --- a/app/services/base_project_service.rb +++ b/app/services/base_project_service.rb @@ -7,7 +7,9 @@ class BaseProjectService < ::BaseContainerService attr_accessor :project def initialize(project:, current_user: nil, params: {}) - super(container: project, current_user: current_user, params: params) + # we need to exclude project params since they may come from external requests. project should always + # be passed as part of the service's initializer + super(container: project, current_user: current_user, params: params.except(:project, :project_id)) @project = project end |