diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-06 14:18:32 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 20:59:25 +0100 |
| commit | 999118f0ec6edabc9e13c089381ad664970a080a (patch) | |
| tree | 4201e2944efb5379c9355999fc3750d0b0710566 /app/controllers/projects | |
| parent | b14c484bb1d174c7c355de2258be1a4414b2cf78 (diff) | |
| download | gitlab-ce-999118f0ec6edabc9e13c089381ad664970a080a.tar.gz | |
Merge branch 'feature/sm/artifacts-trace-ee' into 'master'
EE: Trace as artifacts (FileStorage and ObjectStorage)
Closes #4171
See merge request gitlab-org/gitlab-ee!4258
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/jobs_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb index 4865ec3dfe5..221b31430d8 100644 --- a/app/controllers/projects/jobs_controller.rb +++ b/app/controllers/projects/jobs_controller.rb @@ -1,4 +1,6 @@ class Projects::JobsController < Projects::ApplicationController + prepend EE::Projects::JobsController + before_action :build, except: [:index, :cancel_all] before_action :authorize_read_build!, |