Skip to content

Commit 1794895

Browse files
committed
Merge pull request gitlabhq#1234 from studiofrenetic/fix-admin-hook-tab
Fix current class for hooks tab in admin section
2 parents 0456dd7 + 6641761 commit 1794895

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

app/helpers/application_helper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def tab_class(tab_key)
110110
when :admin_root; controller.controller_name == "dashboard"
111111
when :admin_users; controller.controller_name == 'users'
112112
when :admin_projects; controller.controller_name == "projects"
113-
when :admin_emails; controller.controller_name == 'mailer'
113+
when :admin_hooks; controller.controller_name == 'hooks'
114114
when :admin_resque; controller.controller_name == 'resque'
115115
when :admin_logs; controller.controller_name == 'logs'
116116

app/views/layouts/admin.html.haml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
= link_to "Users", admin_users_path
1515
%li{class: tab_class(:admin_logs)}
1616
= link_to "Logs", admin_logs_path
17-
%li{class: tab_class(:admin_emails)}
17+
%li{class: tab_class(:admin_hooks)}
1818
= link_to "Hooks", admin_hooks_path
1919
%li{class: tab_class(:admin_resque)}
2020
= link_to "Resque", admin_resque_path

0 commit comments

Comments
 (0)