From 64e12d5853b44c945a43a9ed7fc7046138884426 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 24 Sep 2015 09:44:38 +0200 Subject: [PATCH] Add header for ci graphs and check that it is enabled Signed-off-by: Dmitriy Zaporozhets --- app/controllers/projects/application_controller.rb | 7 +++++++ app/views/projects/graphs/ci.html.haml | 1 + 2 files changed, 8 insertions(+) diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb index ee88d49b400..e8af4c092da 100644 --- a/app/controllers/projects/application_controller.rb +++ b/app/controllers/projects/application_controller.rb @@ -1,6 +1,7 @@ class Projects::ApplicationController < ApplicationController before_action :project before_action :repository + before_action :ci_enabled, only: :ci layout 'project' def authenticate_user! @@ -25,4 +26,10 @@ class Projects::ApplicationController < ApplicationController ) end end + + private + + def ci_enabled + return render_404 unless @project.gitlab_ci? + end end diff --git a/app/views/projects/graphs/ci.html.haml b/app/views/projects/graphs/ci.html.haml index 2e07b67f8c0..4f69cc64f7c 100644 --- a/app/views/projects/graphs/ci.html.haml +++ b/app/views/projects/graphs/ci.html.haml @@ -1,4 +1,5 @@ - page_title "Continuous Integration", "Graphs" += render "header_title" = render 'head' #charts.ci-charts = render 'projects/graphs/ci/builds'