Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicaël Bergeron <mbergeron@gitlab.com>2018-03-03 00:19:17 +0300
committerMicaël Bergeron <mbergeron@gitlab.com>2018-03-03 00:19:17 +0300
commitb03b31659b0101dc4a5838bec7dca193706661cd (patch)
tree3bd1004659f85da6d149f89700b7c0e8388f0b31 /app/controllers/projects/jobs_controller.rb
parent4484587ef8c9bf63c60359a0980dda95e854b744 (diff)
fixing some broken merges
Diffstat (limited to 'app/controllers/projects/jobs_controller.rb')
-rw-r--r--app/controllers/projects/jobs_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb
index abf4be6250b..85e972d9731 100644
--- a/app/controllers/projects/jobs_controller.rb
+++ b/app/controllers/projects/jobs_controller.rb
@@ -1,4 +1,6 @@
class Projects::JobsController < Projects::ApplicationController
+ include SendFileUpload
+
before_action :build, except: [:index, :cancel_all]
before_action :authorize_read_build!,