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
0489b9c7
Commit
0489b9c7
authored
5 years ago
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed last commit widget not showing with Gravatar disabled
Closes
https://gitlab.com/gitlab-org/gitlab/issues/207723
parent
36a899b8
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
28 additions
and
10 deletions
+28
-10
app/graphql/types/user_type.rb
app/graphql/types/user_type.rb
+1
-1
changelogs/unreleased/ph-207723-userTypeGravatarDisabled.yml
changelogs/unreleased/ph-207723-userTypeGravatarDisabled.yml
+5
-0
doc/api/graphql/reference/gitlab_schema.graphql
doc/api/graphql/reference/gitlab_schema.graphql
+1
-1
doc/api/graphql/reference/gitlab_schema.json
doc/api/graphql/reference/gitlab_schema.json
+3
-7
doc/api/graphql/reference/index.md
doc/api/graphql/reference/index.md
+1
-1
spec/features/projects/tree/tree_show_spec.rb
spec/features/projects/tree/tree_show_spec.rb
+17
-0
No files found.
app/graphql/types/user_type.rb
View file @
0489b9c7
...
@@ -14,7 +14,7 @@ module Types
...
@@ -14,7 +14,7 @@ module Types
description:
'Human-readable name of the user'
description:
'Human-readable name of the user'
field
:username
,
GraphQL
::
STRING_TYPE
,
null:
false
,
field
:username
,
GraphQL
::
STRING_TYPE
,
null:
false
,
description:
'Username of the user. Unique within this instance of GitLab'
description:
'Username of the user. Unique within this instance of GitLab'
field
:avatar_url
,
GraphQL
::
STRING_TYPE
,
null:
fals
e
,
field
:avatar_url
,
GraphQL
::
STRING_TYPE
,
null:
tru
e
,
description:
"URL of the user's avatar"
description:
"URL of the user's avatar"
field
:web_url
,
GraphQL
::
STRING_TYPE
,
null:
false
,
field
:web_url
,
GraphQL
::
STRING_TYPE
,
null:
false
,
description:
'Web URL of the user'
description:
'Web URL of the user'
...
...
This diff is collapsed.
Click to expand it.
changelogs/unreleased/ph-207723-userTypeGravatarDisabled.yml
0 → 100644
View file @
0489b9c7
---
title
:
Fixed last commit widget when Gravatar is disabled
merge_request
:
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
doc/api/graphql/reference/gitlab_schema.graphql
View file @
0489b9c7
...
@@ -8003,7 +8003,7 @@ type User {
...
@@ -8003,7 +8003,7 @@ type User {
"""
"""
URL
of
the
user
'
s
avatar
URL
of
the
user
'
s
avatar
"""
"""
avatarUrl
:
String
!
avatarUrl
:
String
"""
"""
Human
-
readable
name
of
the
user
Human
-
readable
name
of
the
user
...
...
This diff is collapsed.
Click to expand it.
doc/api/graphql/reference/gitlab_schema.json
View file @
0489b9c7
...
@@ -6171,13 +6171,9 @@
...
@@ -6171,13 +6171,9 @@
],
],
"type"
:
{
"type"
:
{
"kind"
:
"NON_NULL"
,
"name"
:
null
,
"ofType"
:
{
"kind"
:
"SCALAR"
,
"kind"
:
"SCALAR"
,
"name"
:
"String"
,
"name"
:
"String"
,
"ofType"
:
null
"ofType"
:
null
}
},
},
"isDeprecated"
:
false
,
"isDeprecated"
:
false
,
"deprecationReason"
:
null
"deprecationReason"
:
null
...
...
This diff is collapsed.
Click to expand it.
doc/api/graphql/reference/index.md
View file @
0489b9c7
...
@@ -1287,7 +1287,7 @@ Autogenerated return type of UpdateSnippet
...
@@ -1287,7 +1287,7 @@ Autogenerated return type of UpdateSnippet
| Name | Type | Description |
| Name | Type | Description |
| --- | ---- | ---------- |
| --- | ---- | ---------- |
|
`avatarUrl`
| String
!
| URL of the user's avatar |
|
`avatarUrl`
| String | URL of the user's avatar |
|
`name`
| String! | Human-readable name of the user |
|
`name`
| String! | Human-readable name of the user |
|
`userPermissions`
| UserPermissions! | Permissions for the current user on the resource |
|
`userPermissions`
| UserPermissions! | Permissions for the current user on the resource |
|
`username`
| String! | Username of the user. Unique within this instance of GitLab |
|
`username`
| String! | Username of the user. Unique within this instance of GitLab |
...
...
This diff is collapsed.
Click to expand it.
spec/features/projects/tree/tree_show_spec.rb
View file @
0489b9c7
...
@@ -5,11 +5,14 @@ require 'spec_helper'
...
@@ -5,11 +5,14 @@ require 'spec_helper'
describe
'Projects tree'
,
:js
do
describe
'Projects tree'
,
:js
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:gravatar_enabled
)
{
true
}
# This commit has a known state on the master branch of gitlab-test
# This commit has a known state on the master branch of gitlab-test
let
(
:test_sha
)
{
'7975be0116940bf2ad4321f79d02a55c5f7779aa'
}
let
(
:test_sha
)
{
'7975be0116940bf2ad4321f79d02a55c5f7779aa'
}
before
do
before
do
stub_application_setting
(
gravatar_enabled:
gravatar_enabled
)
project
.
add_maintainer
(
user
)
project
.
add_maintainer
(
user
)
sign_in
(
user
)
sign_in
(
user
)
end
end
...
@@ -34,6 +37,20 @@ describe 'Projects tree', :js do
...
@@ -34,6 +37,20 @@ describe 'Projects tree', :js do
expect
(
page
).
not_to
have_selector
(
'.flash-alert'
)
expect
(
page
).
not_to
have_selector
(
'.flash-alert'
)
end
end
context
'gravatar disabled'
do
let
(
:gravatar_enabled
)
{
false
}
it
'renders last commit'
do
visit
project_tree_path
(
project
,
test_sha
)
wait_for_requests
page
.
within
(
'.project-last-commit'
)
do
expect
(
page
).
to
have_selector
(
'.user-avatar-link'
)
expect
(
page
).
to
have_content
(
'Merge branch'
)
end
end
end
context
'for signed commit'
do
context
'for signed commit'
do
it
'displays a GPG badge'
do
it
'displays a GPG badge'
do
visit
project_tree_path
(
project
,
'33f3729a45c02fc67d00adb1b8bca394b0e761d9'
)
visit
project_tree_path
(
project
,
'33f3729a45c02fc67d00adb1b8bca394b0e761d9'
)
...
...
This diff is collapsed.
Click to expand it.
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