Merge branch '25460-replace-word-users-with-members' into 'master'

replace words user(s) with member(s)

Closes #25460

See merge request !8872

app/views/groups/group_members/_new_group_member.html.haml

@@ -3,7 +3,7 @@
     .col-md-4.col-lg-6
       = users_select_tag(:user_ids, multiple: true, class: 'input-clamp', scope: :all, email_user: true)
       .help-block.append-bottom-10
-        Search for users by name, username, or email, or invite new ones using their email address.
+        Search for members by name, username, or email, or invite new ones using their email address.
 
     .col-md-3.col-lg-2
       = select_tag :access_level, options_for_select(GroupMember.access_level_roles, @group_member.access_level), class: "form-control project-access-select"
@@ -16,7 +16,7 @@
         = text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date', placeholder: 'Expiration date'
         %i.clear-icon.js-clear-input
       .help-block.append-bottom-10
-        On this date, the user(s) will automatically lose access to this group and all of its projects.
+        On this date, the member(s) will automatically lose access to this group and all of its projects.
 
     .col-md-2
       = f.submit 'Add to group', class: "btn btn-create btn-block"

app/views/groups/group_members/index.html.haml

@@ -7,7 +7,7 @@
   - if can?(current_user, :admin_group_member, @group)
     .project-members-new.append-bottom-default
       %p.clearfix
-        Add new user to
+        Add new member to
         %strong= @group.name
       = render "new_group_member"
 
@@ -15,7 +15,7 @@
 
   .append-bottom-default.clearfix
     %h5.member.existing-title
-      Existing users
+      Existing members
     = form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form'  do
       .form-group
         = search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
@@ -24,7 +24,7 @@
         = render 'shared/members/sort_dropdown'
   .panel.panel-default
     .panel-heading
-      Users with access to
+      Members with access to
       %strong= @group.name
       %span.badge= @members.total_count
     %ul.content-list

changelogs/unreleased/25460-replace-word-users-with-members.yml

@@ -0,0 +1,4 @@
+---
+title: Replace word user with member
+merge_request: 8872
+author: