Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
237936ac
Commit
237936ac
authored
Feb 07, 2020
by
charlieablett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use 'their' instead of 'his'
Modify non-code instances (in descriptions, etc) of 'his'
parent
becf7b82
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
14 additions
and
14 deletions
+14
-14
app/views/help/ui.html.haml
app/views/help/ui.html.haml
+2
-2
doc/university/training/topics/agile_git.md
doc/university/training/topics/agile_git.md
+1
-1
spec/controllers/admin/spam_logs_controller_spec.rb
spec/controllers/admin/spam_logs_controller_spec.rb
+1
-1
spec/controllers/admin/users_controller_spec.rb
spec/controllers/admin/users_controller_spec.rb
+1
-1
spec/features/invites_spec.rb
spec/features/invites_spec.rb
+1
-1
spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb
...member_cannot_request_access_to_his_group_project_spec.rb
+1
-1
spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb
...mbers/member_cannot_request_access_to_his_project_spec.rb
+1
-1
spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb
...embers/owner_cannot_request_access_to_his_project_spec.rb
+1
-1
spec/features/signed_commits_spec.rb
spec/features/signed_commits_spec.rb
+2
-2
spec/models/clusters/applications/cert_manager_spec.rb
spec/models/clusters/applications/cert_manager_spec.rb
+1
-1
spec/requests/api/users_spec.rb
spec/requests/api/users_spec.rb
+1
-1
spec/support/shared_examples/requests/api/notes_shared_examples.rb
...ort/shared_examples/requests/api/notes_shared_examples.rb
+1
-1
No files found.
app/views/help/ui.html.haml
View file @
237936ac
...
@@ -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'
)
...
...
doc/university/training/topics/agile_git.md
View file @
237936ac
...
@@ -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/he
r initials, and US id.
with
thei
r initials, and US id.
After its tested merge into master and remove the branch.
After its tested merge into master and remove the branch.
...
...
spec/controllers/admin/spam_logs_controller_spec.rb
View file @
237936ac
...
@@ -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."
...
...
spec/controllers/admin/users_controller_spec.rb
View file @
237936ac
...
@@ -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
}
...
...
spec/features/invites_spec.rb
View file @
237936ac
...
@@ -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
)
...
...
spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb
View file @
237936ac
...
@@ -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
)
}
...
...
spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb
View file @
237936ac
...
@@ -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
)
}
...
...
spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb
View file @
237936ac
...
@@ -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
...
...
spec/features/signed_commits_spec.rb
View file @
237936ac
...
@@ -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
)
...
...
spec/models/clusters/applications/cert_manager_spec.rb
View file @
237936ac
...
@@ -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/he
r email to register issuer with certificate provider'
do
it
'uses
thei
r 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
...
...
spec/requests/api/users_spec.rb
View file @
237936ac
...
@@ -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
)
...
...
spec/support/shared_examples/requests/api/notes_shared_examples.rb
View file @
237936ac
...
@@ -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/he
r own noteable'
do
context
'when the user is posting an award emoji on
thei
r 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:'
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment