diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 21:08:05 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 21:08:05 +0000 |
| commit | abae8f34f377519946a91101ef7abf504454531c (patch) | |
| tree | 359fab0082860b6850d4a0a492b8f12eb3d4eb0b /app/controllers/projects/pipelines_controller.rb | |
| parent | 580622bdb3c762a8e89facd8a3946881ee480442 (diff) | |
| download | gitlab-ce-abae8f34f377519946a91101ef7abf504454531c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/pipelines_controller.rb')
| -rw-r--r-- | app/controllers/projects/pipelines_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb index ee102248cb7..ff65f040335 100644 --- a/app/controllers/projects/pipelines_controller.rb +++ b/app/controllers/projects/pipelines_controller.rb @@ -13,6 +13,7 @@ class Projects::PipelinesController < Projects::ApplicationController before_action do push_frontend_feature_flag(:junit_pipeline_view) end + before_action :ensure_pipeline, only: [:show] around_action :allow_gitaly_ref_name_caching, only: [:index, :show] @@ -214,6 +215,10 @@ class Projects::PipelinesController < Projects::ApplicationController params.require(:pipeline).permit(:ref, variables_attributes: %i[key variable_type secret_value]) end + def ensure_pipeline + render_404 unless pipeline + end + # rubocop: disable CodeReuse/ActiveRecord def pipeline @pipeline ||= if params[:id].blank? && params[:latest] |