Merge branch 'from-him-to-them' into 'master'

Replace gendered pronouns

See merge request gitlab-org/gitlab!24659

app/assets/javascripts/pipelines/components/pipelines_table_row.vue

@@ -75,9 +75,9 @@ export default {
      * This field needs a lot of verification, because of different possible cases:
      *
      * 1. person who is an author of a commit might be a GitLab user
-     * 2. if person who is an author of a commit is a GitLab user he/she can have a GitLab avatar
-     * 3. If GitLab user does not have avatar he/she might have a Gravatar
-     * 4. If committer is not a GitLab User he/she can have a Gravatar
+     * 2. if person who is an author of a commit is a GitLab user, they can have a GitLab avatar
+     * 3. If GitLab user does not have avatar they might have a Gravatar
+     * 4. If committer is not a GitLab User they can have a Gravatar
      * 5. We do not have consistent API object in this case
      * 6. We should improve API and the code
      *
@@ -93,17 +93,17 @@ export default {
       // 1. person who is an author of a commit might be a GitLab user
       if (this.pipeline.commit.author) {
         // 2. if person who is an author of a commit is a GitLab user
-        // he/she can have a GitLab avatar
+        // they can have a GitLab avatar
         if (this.pipeline.commit.author.avatar_url) {
           commitAuthorInformation = this.pipeline.commit.author;
 
-          // 3. If GitLab user does not have avatar he/she might have a Gravatar
+          // 3. If GitLab user does not have avatar, they might have a Gravatar
         } else if (this.pipeline.commit.author_gravatar_url) {
           commitAuthorInformation = Object.assign({}, this.pipeline.commit.author, {
             avatar_url: this.pipeline.commit.author_gravatar_url,
           });
         }
-        // 4. If committer is not a GitLab User he/she can have a Gravatar
+        // 4. If committer is not a GitLab User, they can have a Gravatar
       } else {
         commitAuthorInformation = {
           avatar_url: this.pipeline.commit.author_gravatar_url,

app/controllers/root_controller.rb

@@ -52,7 +52,7 @@ class RootController < Dashboard::ProjectsController
   end
 
   def redirect_to_home_page_url?
-    # If user is not signed-in and tries to access root_path - redirect him to landing page
+    # If user is not signed-in and tries to access root_path - redirect them to landing page
     # Don't redirect to the default URL to prevent endless redirections
     return false unless Gitlab::CurrentSettings.home_page_url.present?
 

app/policies/project_policy.rb

@@ -370,7 +370,7 @@ class ProjectPolicy < BasePolicy
 
   # There's two separate cases when builds_disabled is true:
   # 1. When internal CI is disabled - builds_disabled && internal_builds_disabled
-  #   - We do not prevent the user from accessing Pipelines to allow him to access external CI
+  #   - We do not prevent the user from accessing Pipelines to allow them to access external CI
   # 2. When the user is not allowed to access CI - builds_disabled && ~internal_builds_disabled
   #   - We prevent the user from accessing Pipelines
   rule { (builds_disabled & ~internal_builds_disabled) | repository_disabled }.policy do

app/services/projects/overwrite_project_service.rb

@@ -61,7 +61,7 @@ module Projects
     def add_source_project_to_fork_network(source_project)
       return unless @project.fork_network
 
-      # Because he have moved all references in the fork network from the source_project
+      # Because they have moved all references in the fork network from the source_project
       # we won't be able to query the database (only through its cached data),
       # for its former relationships. That's why we're adding it to the network
       # as a fork of the target project

config/gitlab.yml.example

@@ -111,7 +111,7 @@ production: &base
     # Email server smtp settings are in config/initializers/smtp_settings.rb.sample
 
     # default_can_create_group: false  # default: true
-    # username_changing_enabled: false # default: true - User can change her username/namespace
+    # username_changing_enabled: false # default: true - User can change their username/namespace
     ## Default theme ID
     ##   1 - Indigo
     ##   2 - Dark

doc/administration/user_settings.md

@@ -31,5 +31,5 @@ gitlab_rails['gitlab_username_changing_enabled'] = false
 For source installations, uncomment the following line in `config/gitlab.yml`:
 
 ```yaml
-# username_changing_enabled: false # default: true - User can change her username/namespace
+# username_changing_enabled: false # default: true - User can change their username/namespace
 ```

doc/api/members.md

@@ -64,7 +64,7 @@ Example response:
 
 Gets a list of group or project members viewable by the authenticated user, including inherited members through ancestor groups.
 When a user is a member of the project/group and of one or more ancestor groups the user is returned only once with the project `access_level` (if exists)
-or the `access_level` for the user in the first group which he belongs to in the project groups ancestors chain.
+or the `access_level` for the user in the first group which they belong to in the project groups ancestors chain.
 
 ```
 GET /groups/:id/members/all

doc/development/shell_commands.md

@@ -168,7 +168,7 @@ user_input = '../other-repo.git/other-file'
 repo_path = 'repositories/user-repo.git'
 
 # The intention of the code below is to open a file under repo_path, but
-# because the user used '..' she can 'break out' into
+# because the user used '..' they can 'break out' into
 # 'repositories/other-repo.git'
 full_path = File.join(repo_path, user_input)
 File.open(full_path) do # Oops!

lib/gitlab/auth/ldap/access.rb

@@ -49,7 +49,7 @@ module Gitlab
               return true
             end
 
-            # Block user in GitLab if he/she was blocked in AD
+            # Block user in GitLab if they were blocked in AD
             if Gitlab::Auth::LDAP::Person.disabled_via_active_directory?(ldap_identity.extern_uid, adapter)
               block_user(user, 'is disabled in Active Directory')
               false

lib/support/init.d/gitlab

@@ -57,7 +57,7 @@ gitaly_log="$app_root/log/gitaly.log"
 # Read configuration variable file if it is present
 test -f /etc/default/gitlab && . /etc/default/gitlab
 
-# Switch to the app_user if it is not he/she who is running the script.
+# Switch to the app_user if it is not they who are running the script.
 if [ `whoami` != "$app_user" ]; then
   eval su - "$app_user" -c $(echo \")$shell_path -l -c \'$0 "$@"\'$(echo \"); exit;
 fi

spec/controllers/projects/group_links_controller_spec.rb

@@ -37,7 +37,7 @@ describe Projects::GroupLinksController do
       end
     end
 
-    context 'when user has access to group he want to link project to' do
+    context 'when user has access to group they want to link project to' do
       before do
         group.add_developer(user)
       end
@@ -55,7 +55,7 @@ describe Projects::GroupLinksController do
       end
     end
 
-    context 'when user doers not have access to group he want to link to' do
+    context 'when user doers not have access to group they want to link to' do
       include_context 'link project to group'
 
       it 'renders 404' do

spec/features/issues/user_creates_branch_and_merge_request_spec.rb

@@ -287,7 +287,7 @@ describe 'User creates branch and merge request on issue page', :js do
     expect(source_message).to have_text('Source is not available')
 
     # JavaScript gets refs started with `mas` (entered above) and places the first match.
-    # User sees `mas` in black color (the part he entered) and the `ter` in gray color (a hint).
+    # User sees `mas` in black color (the part they entered) and the `ter` in gray color (a hint).
     # Since hinting is implemented via text selection and rspec/capybara doesn't have matchers for it,
     # we just checking the whole source name.
     expect(input_source.value).to eq(project.default_branch)

spec/helpers/nav_helper_spec.rb

@@ -83,7 +83,7 @@ describe NavHelper, :do_not_mock_admin_mode do
           expect(helper.header_links).not_to include(:issues, :merge_requests, :todos, :search)
         end
 
-        it 'shows the search box when the user cannot read cross project and he is visiting a project' do
+        it 'shows the search box when the user cannot read cross project and they are visiting a project' do
           helper.instance_variable_set(:@project, create(:project))
 
           expect(helper.header_links).to include(:search)

spec/lib/gitlab/user_access_spec.rb

@@ -160,7 +160,7 @@ describe Gitlab::UserAccess do
         expect(access.can_push_to_branch?('master')).to be_falsey
       end
 
-      it 'does not allow the user to push if he does not have push access to the canonical project' do
+      it 'does not allow the user to push if they do not have push access to the canonical project' do
         canonical_project.add_guest(user)
 
         expect(access.can_push_to_branch?('awesome-feature')).to be_falsey

spec/requests/api/project_hooks_spec.rb

@@ -215,7 +215,7 @@ describe API::ProjectHooks, 'ProjectHooks' do
       expect(response).to have_gitlab_http_status(404)
     end
 
-    it "returns a 404 if a user attempts to delete project hooks he/she does not own" do
+    it "returns a 404 if a user attempts to delete project hooks they do not own" do
       test_user = create(:user)
       other_project = create(:project)
       other_project.add_maintainer(test_user)

spec/services/notification_service_spec.rb

@@ -988,7 +988,7 @@ describe NotificationService, :mailer do
         expect(email).to have_header('X-GitLab-NotificationReason', NotificationReason::ASSIGNED)
       end
 
-      it 'emails previous assignee even if he has the "on mention" notif level' do
+      it 'emails previous assignee even if they have the "on mention" notif level' do
         issue.assignees = [@u_mentioned]
         notification.reassigned_issue(issue, @u_disabled, [@u_watcher])
 
@@ -1005,7 +1005,7 @@ describe NotificationService, :mailer do
         should_not_email(@u_lazy_participant)
       end
 
-      it 'emails new assignee even if he has the "on mention" notif level' do
+      it 'emails new assignee even if they have the "on mention" notif level' do
         issue.assignees = [@u_mentioned]
         notification.reassigned_issue(issue, @u_disabled, [@u_mentioned])