Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/reports/components/report_item.vue

@@ -45,7 +45,7 @@ export default {
 <template>
   <li
     :class="{ 'is-dismissed': issue.isDismissed }"
-    class="report-block-list-issue justify-content-center align-items-center"
+    class="report-block-list-issue align-items-center"
   >
     <issue-status-icon
       v-if="showReportSectionStatusIcon"

app/assets/javascripts/reports/components/summary_row.vue

@@ -44,9 +44,7 @@ export default {
 };
 </script>
 <template>
-  <div
-    class="report-block-list-issue report-block-list-issue-parent justify-content-center align-items-center"
-  >
+  <div class="report-block-list-issue report-block-list-issue-parent align-items-center">
     <div class="report-block-list-icon append-right-default">
       <gl-loading-icon
         v-if="statusIcon === 'loading'"

changelogs/unreleased/fix-alignment-on-security-reports.yml

+---
+title: Fixes alignment issues with reports
+merge_request: 30839
+author:
+type: fixed

changelogs/unreleased/fj-avoid-incresaing-usage-ping-when-not-enabled.yml

+---
+title: Avoid increasing redis counters when usage_ping is disabled
+merge_request: 30949
+author:
+type: changed

lib/gitlab/usage_data_counters/redis_counter.rb

@@ -4,6 +4,8 @@ module Gitlab
   module UsageDataCounters
     module RedisCounter
       def increment(redis_counter_key)
+        return unless Gitlab::CurrentSettings.usage_ping_enabled
+
         Gitlab::Redis::SharedState.with { |redis| redis.incr(redis_counter_key) }
       end
 

spec/lib/gitlab/usage_data_counters/redis_counter_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::UsageDataCounters::RedisCounter, :clean_gitlab_redis_shared_state do
+  let(:redis_key) { 'foobar' }
+
+  subject { Class.new.extend(described_class) }
+
+  before do
+    stub_application_setting(usage_ping_enabled: setting_value)
+  end
+
+  context 'when usage_ping is disabled' do
+    let(:setting_value) { false }
+
+    it 'counter is not increased' do
+      expect do
+        subject.increment(redis_key)
+      end.not_to change { subject.total_count(redis_key) }
+    end
+  end
+
+  context 'when usage_ping is enabled' do
+    let(:setting_value) { true }
+
+    it 'counter is increased' do
+      expect do
+        subject.increment(redis_key)
+      end.to change { subject.total_count(redis_key) }.by(1)
+    end
+  end
+end