Merge branch 'djensen-change-approved-to-merged-in-contribution-analytics' into 'master'

Change approved to merged in Contribution Analytics

See merge request gitlab-org/gitlab!33535

doc/user/group/contribution_analytics/index.md

@@ -63,7 +63,7 @@ Contributions per group member are also presented in tabular format. Click a col
 - Number of opened issues
 - Number of closed issues
 - Number of opened MRs
-- Number of accepted MRs
+- Number of merged MRs
 - Number of total contributions
 
 ![Contribution analytics contributions table](img/group_stats_table.png)

ee/app/assets/javascripts/group_member_contributions/constants.js

@@ -5,8 +5,8 @@ const COLUMNS = [
   { name: 'push', text: __('Pushed') },
   { name: 'issuesCreated', text: __('Opened issues') },
   { name: 'issuesClosed', text: __('Closed issues') },
-  { name: 'mergeRequestsCreated', text: __('Opened MR') },
-  { name: 'mergeRequestsMerged', text: __('Accepted MR') },
+  { name: 'mergeRequestsCreated', text: __('Opened MRs') },
+  { name: 'mergeRequestsMerged', text: __('Merged MRs') },
   { name: 'totalEvents', text: __('Total Contributions') },
 ];
 

ee/app/views/groups/contribution_analytics/show.html.haml

@@ -45,7 +45,7 @@
     - mr_created_count = @data_collector.total_merge_requests_created_count
     - mr_merged_count = @data_collector.total_merge_requests_merged_count
     - if mr_created_count > 0 || mr_merged_count > 0
-      = s_('ContributionAnalytics|<strong>%{created_count}</strong> created, <strong>%{accepted_count}</strong> accepted.').html_safe % { created_count: mr_created_count, accepted_count: mr_merged_count }
+      = s_('ContributionAnalytics|<strong>%{created_count}</strong> created, <strong>%{merged_count}</strong> merged.').html_safe % { created_count: mr_created_count, merged_count: mr_merged_count }
     - else
       = s_('ContributionAnalytics|No merge requests for the selected time period.')
 

ee/changelogs/unreleased/djensen-change-approved-to-merged-in-contribution-analytics.yml

+---
+title: Change approved to merged in Contribution Analytics
+merge_request: 33535
+author:
+type: changed

locale/gitlab.pot

@@ -1033,9 +1033,6 @@ msgstr ""
 msgid "Acceptable for use in this project"
 msgstr ""
 
-msgid "Accepted MR"
-msgstr ""
-
 msgid "Access Tokens"
 msgstr ""
 
@@ -6124,10 +6121,10 @@ msgstr ""
 msgid "Contribution Analytics"
 msgstr ""
 
-msgid "ContributionAnalytics|<strong>%{created_count}</strong> created, <strong>%{accepted_count}</strong> accepted."
+msgid "ContributionAnalytics|<strong>%{created_count}</strong> created, <strong>%{closed_count}</strong> closed."
 msgstr ""
 
-msgid "ContributionAnalytics|<strong>%{created_count}</strong> created, <strong>%{closed_count}</strong> closed."
+msgid "ContributionAnalytics|<strong>%{created_count}</strong> created, <strong>%{merged_count}</strong> merged."
 msgstr ""
 
 msgid "ContributionAnalytics|<strong>%{pushes}</strong> pushes, more than <strong>%{commits}</strong> commits by <strong>%{people}</strong> contributors."
@@ -13734,6 +13731,9 @@ msgstr ""
 msgid "Merged"
 msgstr ""
 
+msgid "Merged MRs"
+msgstr ""
+
 msgid "Merged branches are being deleted. This can take some time depending on the number of branches. Please refresh the page to see changes."
 msgstr ""
 
@@ -15215,7 +15215,7 @@ msgstr ""
 msgid "Opened"
 msgstr ""
 
-msgid "Opened MR"
+msgid "Opened MRs"
 msgstr ""
 
 msgid "Opened issues"