Commit 674efd38 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix 500 error on services page. Fixed active project tab when on services

parent cc0295b7
...@@ -72,7 +72,7 @@ module TabHelper ...@@ -72,7 +72,7 @@ module TabHelper
return "active" if current_page?(controller: "projects", action: action, id: @project) return "active" if current_page?(controller: "projects", action: action, id: @project)
end end
if ['snippets', 'hooks', 'deploy_keys', 'team_members'].include? controller.controller_name if ['snippets', 'services', 'hooks', 'deploy_keys', 'team_members'].include? controller.controller_name
"active" "active"
end end
end end
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
GitLab CI GitLab CI
%small Continuous integration server from GitLab %small Continuous integration server from GitLab
.right .right
- if @gitlab_ci_service.active - if @gitlab_ci_service.try(:active)
%small.cgreen Enabled %small.cgreen Enabled
- else - else
%small.cgray Disabled %small.cgray Disabled
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment