diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-01 14:52:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-01 14:52:43 +0300 |
| commit | 430576c997e7cfc61b003cf6dbf12817ef899eef (patch) | |
| tree | 7884f12a7837f5029b971e04121a66fb81ffdb34 /app/controllers/projects | |
| parent | afbc608ba558c62cc0475dfb95df3f375049973b (diff) | |
Add latest changes from gitlab-org/security/gitlab@15-5-stable-ee
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/pipelines_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb index 2a8f7171f9c..01f7bb9e2cf 100644 --- a/app/controllers/projects/pipelines_controller.rb +++ b/app/controllers/projects/pipelines_controller.rb @@ -239,8 +239,7 @@ class Projects::PipelinesController < Projects::ApplicationController def config_variables respond_to do |format| format.json do - project = @project.uses_external_project_ci_config? ? @project.ci_config_external_project : @project - result = Ci::ListConfigVariablesService.new(project, current_user).execute(params[:sha]) + result = Ci::ListConfigVariablesService.new(@project, current_user).execute(params[:sha]) result.nil? ? head(:no_content) : render(json: result) end |