diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-16 09:44:53 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-16 09:44:53 +0300 |
| commit | aad3cbeec52cf5bbb5a2c724eeb9b946be6f0fe9 (patch) | |
| tree | 0abaf6993de9f7625a416f6e7259d9ad45c8c15b /app/helpers/tab_helper.rb | |
| parent | 60df262c38d7c235b483cc1c4beb12f793e0e58a (diff) | |
| parent | 584580e5156020e639b2a578c332ae92e38b3a5c (diff) | |
Merge branch 'team-members' into 'master'
Use same layout and interactivity for project members as group members and make code more consistent.
It's probably easiest to review the commits one by one, but keep in mind that later commits sometimes touch the same place as earlier ones, so look at the complete diff to add comments.
The project members page and group members page now look and work the same, with an inline "Add members" form, member search and editing of access levels and deleting without page refresh.
Before:
After:
See merge request !1695
Diffstat (limited to 'app/helpers/tab_helper.rb')
| -rw-r--r-- | app/helpers/tab_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb index 7a401a274d3..a1d263d9d3a 100644 --- a/app/helpers/tab_helper.rb +++ b/app/helpers/tab_helper.rb @@ -89,7 +89,7 @@ module TabHelper def project_tab_class return "active" if current_page?(controller: "/projects", action: :edit, id: @project) - if ['services', 'hooks', 'deploy_keys', 'team_members', 'protected_branches'].include? controller.controller_name + if ['services', 'hooks', 'deploy_keys', 'project_members', 'protected_branches'].include? controller.controller_name "active" end end |