diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-08-03 14:17:22 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-08-03 14:17:22 +0900 |
| commit | 1f53cf7cf0cb53b5d69ab141fa9020356e62027e (patch) | |
| tree | fac87bd3fcf2900116bbc2777eb6f347f50922f6 /app/controllers/projects | |
| parent | d867081df185b873667d9eec1184ac92efc8973e (diff) | |
| parent | 5f664759b57ef1c0fcfb7e95dfbff6c080a7a72f (diff) | |
| download | gitlab-ce-1f53cf7cf0cb53b5d69ab141fa9020356e62027e.tar.gz | |
Merge branch 'master-ce' into artifact-format-v2-with-parser
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/pipelines_controller.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb index 1d5d1ee5d5a..b5db646bf57 100644 --- a/app/controllers/projects/pipelines_controller.rb +++ b/app/controllers/projects/pipelines_controller.rb @@ -1,7 +1,6 @@ class Projects::PipelinesController < Projects::ApplicationController before_action :whitelist_query_limiting, only: [:create, :retry] before_action :pipeline, except: [:index, :new, :create, :charts] - before_action :commit, only: [:show, :builds, :failures] before_action :authorize_read_pipeline! before_action :authorize_create_pipeline!, only: [:new, :create] before_action :authorize_update_pipeline!, only: [:retry, :cancel] @@ -168,10 +167,6 @@ class Projects::PipelinesController < Projects::ApplicationController .present(current_user: current_user) end - def commit - @commit ||= @pipeline.commit - end - def whitelist_query_limiting # Also see https://gitlab.com/gitlab-org/gitlab-ce/issues/42343 Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42339') |