diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-16 06:07:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-16 06:07:43 +0300 |
| commit | c8f81c2efdfd077f3f3146359a1ac4bd6e5359e4 (patch) | |
| tree | 2c8486f8a25ac62f4a9724c70b75c02901a0a314 /app | |
| parent | 3d7409c5d5c471fb95990200f7f78965dd2f42cf (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue | 7 | ||||
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue index 319df090ff1..2cef37d5c2e 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue @@ -58,21 +58,22 @@ export default { <section> <p v-if="relatedLinks.closing" - :class="{ 'gl-display-line gl-m-0': glFeatures.restructuredMrWidget }" + :class="{ 'gl-display-inline gl-m-0': glFeatures.restructuredMrWidget }" > {{ closesText }} <span v-safe-html="relatedLinks.closing"></span> </p> <p v-if="relatedLinks.mentioned" - :class="{ 'gl-display-line gl-m-0': glFeatures.restructuredMrWidget }" + :class="{ 'gl-display-inline gl-m-0': glFeatures.restructuredMrWidget }" > + <span v-if="relatedLinks.closing && glFeatures.restructuredMrWidget">·</span> {{ n__('mrWidget|Mentions issue', 'mrWidget|Mentions issues', relatedLinks.mentionedCount) }} <span v-safe-html="relatedLinks.mentioned"></span> </p> <p v-if="shouldShowAssignToMeLink" - :class="{ 'gl-display-line gl-m-0': glFeatures.restructuredMrWidget }" + :class="{ 'gl-display-inline gl-m-0': glFeatures.restructuredMrWidget }" > <span> <gl-link rel="nofollow" data-method="post" :href="relatedLinks.assignToMe">{{ diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index f9df0307a01..0dd85376050 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -66,7 +66,12 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController render html: Gitlab::Highlight.highlight('payload.json', usage_data_json, language: 'json') end - format.json { render json: Gitlab::Usage::ServicePingReport.for(output: :all_metrics_values, cached: true).to_json } + + format.json do + Gitlab::UsageDataCounters::ServiceUsageDataCounter.count(:download_payload_click) + + render json: Gitlab::Usage::ServicePingReport.for(output: :all_metrics_values, cached: true).to_json + end end end |