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

Dmitriy Zaporozhets
1 parent cc0295b7
Showing 2 changed files with 2 additions and 2 deletions Show diff stats
app/helpers/tab_helper.rb
app/views/services/index.html.haml
@@ -72,7 +72,7 @@ module TabHelper
       return "active" if current_page?(controller: "projects", action: action, id: @project)
     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"
     end
   end
@@ -9,7 +9,7 @@
         GitLab CI
         %small Continuous integration server from GitLab
       .right
-        - if @gitlab_ci_service.active
+        - if @gitlab_ci_service.try(:active)
           %small.cgreen Enabled
         - else
           %small.cgray Disabled
...	...	@@ -72,7 +72,7 @@ module TabHelper
72	72	return "active" if current_page?(controller: "projects", action: action, id: @project)
73	73	end
74	74
75		- if ['snippets', 'hooks', 'deploy_keys', 'team_members'].include? controller.controller_name
	75	+ if ['snippets', 'services', 'hooks', 'deploy_keys', 'team_members'].include? controller.controller_name
76	76	"active"
77	77	end
78	78	end
...	...
...	...	@@ -9,7 +9,7 @@
9	9	GitLab CI
10	10	%small Continuous integration server from GitLab
11	11	.right
12		- - if @gitlab_ci_service.active
	12	+ - if @gitlab_ci_service.try(:active)
13	13	%small.cgreen Enabled
14	14	- else
15	15	%small.cgray Disabled
...	...