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
6a390ac1
Commit
6a390ac1
authored
Mar 22, 2021
by
Yogi
Committed by
Jose Ivan Vargas
Mar 22, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address graphs in the contributor page
parent
9cf1ee01
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
8 deletions
+25
-8
app/assets/javascripts/contributors/components/contributors.vue
...sets/javascripts/contributors/components/contributors.vue
+7
-4
changelogs/unreleased/301246-graph-spacing.yml
changelogs/unreleased/301246-graph-spacing.yml
+5
-0
spec/frontend/contributors/component/__snapshots__/contributors_spec.js.snap
...ibutors/component/__snapshots__/contributors_spec.js.snap
+13
-4
No files found.
app/assets/javascripts/contributors/components/contributors.vue
View file @
6a390ac1
...
@@ -201,11 +201,12 @@ export default {
...
@@ -201,11 +201,12 @@ export default {
</div>
</div>
<div
v-else-if=
"showChart"
class=
"contributors-charts"
>
<div
v-else-if=
"showChart"
class=
"contributors-charts"
>
<h4>
{{
__
(
'
Commits to
'
)
}}
{{
branch
}}
</h4>
<h4
class=
"gl-mb-2 gl-mt-5"
>
{{
__
(
'
Commits to
'
)
}}
{{
branch
}}
</h4>
<span>
{{
__
(
'
Excluding merge commits. Limited to 6,000 commits.
'
)
}}
</span>
<span>
{{
__
(
'
Excluding merge commits. Limited to 6,000 commits.
'
)
}}
</span>
<resizable-chart-container>
<resizable-chart-container>
<gl-area-chart
<gl-area-chart
slot-scope=
"
{ width }"
slot-scope=
"
{ width }"
class="gl-mb-5"
:width="width"
:width="width"
:data="masterChartData"
:data="masterChartData"
:option="masterChartOptions"
:option="masterChartOptions"
...
@@ -218,10 +219,12 @@ export default {
...
@@ -218,10 +219,12 @@ export default {
<div
<div
v-for=
"(contributor, index) in individualChartsData"
v-for=
"(contributor, index) in individualChartsData"
:key=
"index"
:key=
"index"
class=
"col-lg-6 col-12"
class=
"col-lg-6 col-12
gl-my-5
"
>
>
<h4>
{{
contributor
.
name
}}
</h4>
<h4
class=
"gl-mb-2 gl-mt-0"
>
{{
contributor
.
name
}}
</h4>
<p>
{{
n__
(
'
%d commit
'
,
'
%d commits
'
,
contributor
.
commits
)
}}
(
{{
contributor
.
email
}}
)
</p>
<p
class=
"gl-mb-3"
>
{{
n__
(
'
%d commit
'
,
'
%d commits
'
,
contributor
.
commits
)
}}
(
{{
contributor
.
email
}}
)
</p>
<resizable-chart-container>
<resizable-chart-container>
<gl-area-chart
<gl-area-chart
slot-scope=
"
{ width }"
slot-scope=
"
{ width }"
...
...
changelogs/unreleased/301246-graph-spacing.yml
0 → 100644
View file @
6a390ac1
---
title
:
Add space to graph in contributor page
merge_request
:
54431
author
:
Yogi (@yo)
type
:
changed
spec/frontend/contributors/component/__snapshots__/contributors_spec.js.snap
View file @
6a390ac1
...
@@ -5,7 +5,9 @@ exports[`Contributors charts should render charts when loading completed and the
...
@@ -5,7 +5,9 @@ exports[`Contributors charts should render charts when loading completed and the
<div
<div
class="contributors-charts"
class="contributors-charts"
>
>
<h4>
<h4
class="gl-mb-2 gl-mt-5"
>
Commits to master
Commits to master
</h4>
</h4>
...
@@ -16,6 +18,7 @@ exports[`Contributors charts should render charts when loading completed and the
...
@@ -16,6 +18,7 @@ exports[`Contributors charts should render charts when loading completed and the
<div>
<div>
<glareachart-stub
<glareachart-stub
annotations=""
annotations=""
class="gl-mb-5"
data="[object Object]"
data="[object Object]"
height="264"
height="264"
includelegendavgmax="true"
includelegendavgmax="true"
...
@@ -34,14 +37,20 @@ exports[`Contributors charts should render charts when loading completed and the
...
@@ -34,14 +37,20 @@ exports[`Contributors charts should render charts when loading completed and the
class="row"
class="row"
>
>
<div
<div
class="col-lg-6 col-12"
class="col-lg-6 col-12
gl-my-5
"
>
>
<h4>
<h4
class="gl-mb-2 gl-mt-0"
>
John
John
</h4>
</h4>
<p>
<p
class="gl-mb-3"
>
2 commits (jawnnypoo@gmail.com)
2 commits (jawnnypoo@gmail.com)
</p>
</p>
<div>
<div>
...
...
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