Commit 237936ac authored by charlieablett's avatar charlieablett

Use 'their' instead of 'his'

Modify non-code instances (in descriptions, etc) of 'his'
parent becf7b82
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
Dropdown option Dropdown option
.dropdown-footer .dropdown-footer
%strong Tip: %strong Tip:
If an author is not a member of this project, you can still filter by his name while using the search field. If an author is not a member of this project, you can still filter by their name while using the search field.
.dropdown.inline .dropdown.inline
%button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown' } } %button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown' } }
Dropdown loading Dropdown loading
...@@ -322,7 +322,7 @@ ...@@ -322,7 +322,7 @@
Dropdown option Dropdown option
.dropdown-footer .dropdown-footer
%strong Tip: %strong Tip:
If an author is not a member of this project, you can still filter by his name while using the search field. If an author is not a member of this project, you can still filter by their name while using the search field.
.dropdown-loading .dropdown-loading
= icon('spinner spin') = icon('spinner spin')
......
...@@ -20,7 +20,7 @@ Branching in an Agile environment usually happens around user stories with one ...@@ -20,7 +20,7 @@ Branching in an Agile environment usually happens around user stories with one
or more developers working on it. or more developers working on it.
If more than one developer then another branch for each developer is also used If more than one developer then another branch for each developer is also used
with his/her initials, and US id. with their initials, and US id.
After its tested merge into master and remove the branch. After its tested merge into master and remove the branch.
......
...@@ -27,7 +27,7 @@ describe Admin::SpamLogsController do ...@@ -27,7 +27,7 @@ describe Admin::SpamLogsController do
expect(response).to have_gitlab_http_status(:ok) expect(response).to have_gitlab_http_status(:ok)
end end
it 'removes user and his spam logs when removing the user', :sidekiq_might_not_need_inline do it 'removes user and their spam logs when removing the user', :sidekiq_might_not_need_inline do
delete :destroy, params: { id: first_spam.id, remove_user: true } delete :destroy, params: { id: first_spam.id, remove_user: true }
expect(flash[:notice]).to eq "User #{user.username} was successfully removed." expect(flash[:notice]).to eq "User #{user.username} was successfully removed."
......
...@@ -270,7 +270,7 @@ describe Admin::UsersController do ...@@ -270,7 +270,7 @@ describe Admin::UsersController do
post :update, params: params post :update, params: params
end end
context 'when the admin changes his own password' do context 'when the admin changes their own password' do
it 'updates the password' do it 'updates the password' do
expect { update_password(admin, 'AValidPassword1') } expect { update_password(admin, 'AValidPassword1') }
.to change { admin.reload.encrypted_password } .to change { admin.reload.encrypted_password }
......
...@@ -169,7 +169,7 @@ describe 'Invites' do ...@@ -169,7 +169,7 @@ describe 'Invites' do
end end
end end
it "doesn't accept invitations until the user confirms his email" do it "doesn't accept invitations until the user confirms their email" do
fill_in_sign_up_form(new_user) fill_in_sign_up_form(new_user)
sign_in(owner) sign_in(owner)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
require 'spec_helper' require 'spec_helper'
describe 'Projects > Members > Group member cannot request access to his group project' do describe 'Projects > Members > Group member cannot request access to their group project' do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:group) { create(:group) } let(:group) { create(:group) }
let(:project) { create(:project, namespace: group) } let(:project) { create(:project, namespace: group) }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
require 'spec_helper' require 'spec_helper'
describe 'Projects > Members > Member cannot request access to his project' do describe 'Projects > Members > Member cannot request access to their project' do
let(:member) { create(:user) } let(:member) { create(:user) }
let(:project) { create(:project) } let(:project) { create(:project) }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
require 'spec_helper' require 'spec_helper'
describe 'Projects > Members > Owner cannot request access to his project' do describe 'Projects > Members > Owner cannot request access to their own project' do
let(:project) { create(:project) } let(:project) { create(:project) }
before do before do
......
...@@ -5,7 +5,7 @@ require 'spec_helper' ...@@ -5,7 +5,7 @@ require 'spec_helper'
describe 'GPG signed commits' do describe 'GPG signed commits' do
let(:project) { create(:project, :public, :repository) } let(:project) { create(:project, :public, :repository) }
it 'changes from unverified to verified when the user changes his email to match the gpg key', :sidekiq_might_not_need_inline do it 'changes from unverified to verified when the user changes their email to match the gpg key', :sidekiq_might_not_need_inline do
ref = GpgHelpers::SIGNED_AND_AUTHORED_SHA ref = GpgHelpers::SIGNED_AND_AUTHORED_SHA
user = create(:user, email: 'unrelated.user@example.org') user = create(:user, email: 'unrelated.user@example.org')
...@@ -18,7 +18,7 @@ describe 'GPG signed commits' do ...@@ -18,7 +18,7 @@ describe 'GPG signed commits' do
expect(page).to have_button 'Unverified' expect(page).to have_button 'Unverified'
expect(page).not_to have_button 'Verified' expect(page).not_to have_button 'Verified'
# user changes his email which makes the gpg key verified # user changes their email which makes the gpg key verified
perform_enqueued_jobs do perform_enqueued_jobs do
user.skip_reconfirmation! user.skip_reconfirmation!
user.update!(email: GpgHelpers::User1.emails.first) user.update!(email: GpgHelpers::User1.emails.first)
......
...@@ -65,7 +65,7 @@ describe Clusters::Applications::CertManager do ...@@ -65,7 +65,7 @@ describe Clusters::Applications::CertManager do
cert_manager.email = cert_email cert_manager.email = cert_email
end end
it 'uses his/her email to register issuer with certificate provider' do it 'uses their email to register issuer with certificate provider' do
expect(subject.files).to eq(cert_manager.files.merge(cluster_issuer_file)) expect(subject.files).to eq(cert_manager.files.merge(cluster_issuer_file))
end end
end end
......
...@@ -749,7 +749,7 @@ describe API::Users do ...@@ -749,7 +749,7 @@ describe API::Users do
expect(user.email).to eq('new@email.com') expect(user.email).to eq('new@email.com')
end end
it 'updates user with his own username' do it 'updates user with their own username' do
put api("/users/#{user.id}", admin), params: { username: user.username } put api("/users/#{user.id}", admin), params: { username: user.username }
expect(response).to have_gitlab_http_status(200) expect(response).to have_gitlab_http_status(200)
......
...@@ -239,7 +239,7 @@ RSpec.shared_examples 'noteable API' do |parent_type, noteable_type, id_name| ...@@ -239,7 +239,7 @@ RSpec.shared_examples 'noteable API' do |parent_type, noteable_type, id_name|
end end
end end
context 'when the user is posting an award emoji on his/her own noteable' do context 'when the user is posting an award emoji on their own noteable' do
it 'creates a new note' do it 'creates a new note' do
post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/notes", user), params: { body: ':+1:' } post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/notes", user), params: { body: ':+1:' }
......
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