mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-17 08:36:06 +10:00
Merge branch 'fix-members-group-path' into 'master'
Fix LDAP group links page by using new group members route. - Reported by Apple: https://gitlab.zendesk.com/agent/tickets/2273 - Reported on gitlab.com: https://gitlab.com/gitlab-org/gitlab-ce/issues/1382 cc @patricio See merge request !364
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
v 7.10.0 (unreleased)
|
||||
- Improve UI for next pages: Group LDAP sync, Project git hooks, Project share with groups, Admin -> Appearance settigns
|
||||
- Default git hooks for new projects
|
||||
- Fix LDAP group links page by using new group members route.
|
||||
|
||||
v 7.9.0 (unreleased)
|
||||
- Strip prefixes and suffixes from synced SSH keys:
|
||||
|
||||
@@ -5,6 +5,6 @@ class Groups::LdapsController < Groups::ApplicationController
|
||||
def reset_access
|
||||
LdapGroupResetService.new.execute(group, current_user)
|
||||
|
||||
redirect_to members_group_path(@group), notice: 'Access reset complete'
|
||||
redirect_to group_group_members_path(@group), notice: 'Access reset complete'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -18,4 +18,4 @@
|
||||
= render 'groups/group_members/group_member', member: member, show_controls: false, show_roles: false
|
||||
- if shared_group_users_count > 20
|
||||
%li
|
||||
and #{shared_group_users_count - 20} more. For full list visit #{link_to 'group members page', members_group_path(shared_group)}
|
||||
and #{shared_group_users_count - 20} more. For full list visit #{link_to 'group members page', group_group_members_path(shared_group)}
|
||||
|
||||
Reference in New Issue
Block a user