Commit 0535308b authored by Illya Klymov's avatar Illya Klymov

Merge branch 'calebcooper-change-group-projects-title' into 'master'

Change "Group projects" title for tile in Users admin page to "Groups"

See merge request gitlab-org/gitlab!77331
parents dbff4879 21b105af
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
- if @user.groups.any? - if @user.groups.any?
.card .card
.card-header= _('Group projects') .card-header= _('Groups')
%ul.hover-list %ul.hover-list
- @user.group_members.includes(:source).each do |group_member| # rubocop: disable CodeReuse/ActiveRecord - @user.group_members.includes(:source).each do |group_member| # rubocop: disable CodeReuse/ActiveRecord
- group = group_member.group - group = group_member.group
......
...@@ -16787,9 +16787,6 @@ msgstr "" ...@@ -16787,9 +16787,6 @@ msgstr ""
msgid "Group project URLs are prefixed with the group namespace" msgid "Group project URLs are prefixed with the group namespace"
msgstr "" msgstr ""
msgid "Group projects"
msgstr ""
msgid "Group requires separate account" msgid "Group requires separate account"
msgstr "" msgstr ""
......
...@@ -462,9 +462,9 @@ RSpec.describe 'Admin::Users' do ...@@ -462,9 +462,9 @@ RSpec.describe 'Admin::Users' do
visit projects_admin_user_path(user) visit projects_admin_user_path(user)
end end
it 'lists group projects' do it 'lists groups' do
within(:css, '.gl-mb-3 + .card') do within(:css, '.gl-mb-3 + .card') do
expect(page).to have_content 'Group projects' expect(page).to have_content 'Groups'
expect(page).to have_link group.name, href: admin_group_path(group) expect(page).to have_link group.name, href: admin_group_path(group)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment