deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-12-05 14:17:40 +02:00
parent cc0295b789
commit 674efd38d8
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/tab_helper.rb
View file

@ -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

2
app/views/services/index.html.haml
View file

@ -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