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
b8c3613c
Commit
b8c3613c
authored
Jul 26, 2021
by
Mark Lapierre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix contribution analytics MR closed count param
Changelog: fixed EE: true
parent
12ecbd85
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
ee/app/views/groups/contribution_analytics/show.html.haml
ee/app/views/groups/contribution_analytics/show.html.haml
+1
-1
No files found.
ee/app/views/groups/contribution_analytics/show.html.haml
View file @
b8c3613c
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
-
mr_created_count
=
@data_collector
.
total_merge_requests_created_count
-
mr_created_count
=
@data_collector
.
total_merge_requests_created_count
-
mr_merged_count
=
@data_collector
.
total_merge_requests_merged_count
-
mr_merged_count
=
@data_collector
.
total_merge_requests_merged_count
-
if
mr_closed_count
>
0
||
mr_created_count
>
0
||
mr_merged_count
>
0
-
if
mr_closed_count
>
0
||
mr_created_count
>
0
||
mr_merged_count
>
0
=
html_escape
(
s_
(
'ContributionAnalytics|%{created_count} created, %{merged_count} merged, %{closed_count} closed.'
))
%
{
mr_
closed_count:
tag
.
strong
(
mr_closed_count
),
created_count:
tag
.
strong
(
mr_created_count
),
merged_count:
tag
.
strong
(
mr_merged_count
)
}
=
html_escape
(
s_
(
'ContributionAnalytics|%{created_count} created, %{merged_count} merged, %{closed_count} closed.'
))
%
{
closed_count:
tag
.
strong
(
mr_closed_count
),
created_count:
tag
.
strong
(
mr_created_count
),
merged_count:
tag
.
strong
(
mr_merged_count
)
}
-
else
-
else
=
s_
(
'ContributionAnalytics|No merge requests for the selected time period.'
)
=
s_
(
'ContributionAnalytics|No merge requests for the selected time period.'
)
...
...
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