diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-12-05 14:17:40 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-12-05 14:17:40 +0200 |
| commit | 674efd38d83d6f805d2ed9637028d195470b309b (patch) | |
| tree | 5b0defa2cb7cdaff48e5a5a1ccba7918ee81bb87 | |
| parent | cc0295b789a89a3f52e83e34b08ddf17b464308a (diff) | |
| download | gitlab-ce-674efd38d83d6f805d2ed9637028d195470b309b.tar.gz | |
Fix 500 error on services page. Fixed active project tab when on services
| -rw-r--r-- | app/helpers/tab_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/services/index.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb index a4bec87caa7..d52d8af6641 100644 --- a/app/helpers/tab_helper.rb +++ b/app/helpers/tab_helper.rb @@ -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 diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml index 81599ec7c3f..ae3dbef97ad 100644 --- a/app/views/services/index.html.haml +++ b/app/views/services/index.html.haml @@ -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 |