Add latest changes from gitlab-org/gitlab@master

.rubocop_todo/gitlab/feature_flag_key_dynamic.yml

@@ -1,7 +1,6 @@
 ---
 # Cop supports --autocorrect.
 Gitlab/FeatureFlagKeyDynamic:
-  Details: grace period
   Exclude:
     - 'app/graphql/resolvers/app_config/gitlab_instance_feature_flags_resolver.rb'
     - 'app/graphql/resolvers/feature_flag_resolver.rb'

app/assets/javascripts/notes/components/note_header.vue

@@ -172,7 +172,7 @@ export default {
       </a>
       <span
         v-if="!isSystemNote && !emailParticipant"
-        class="text-nowrap author-username -gl-m-2 gl-mr-0 gl-truncate gl-p-2"
+        class="text-nowrap author-username -gl-m-2 gl-mr-0 gl-hidden gl-truncate gl-p-2 md:gl-inline"
       >
         <a
           ref="authorUsernameLink"
@@ -180,7 +180,7 @@ export default {
           :href="authorHref"
           @mouseenter="handleUsernameMouseEnter"
           @mouseleave="handleUsernameMouseLeave"
-          ><span class="note-headline-light gl-hidden md:gl-inline">@{{ author.username }}</span>
+          ><span class="note-headline-light">@{{ author.username }}</span>
         </a>
         <slot name="note-header-info"></slot>
       </span>
@@ -190,7 +190,12 @@ export default {
     </template>
     <span v-else>{{ __('A deleted user') }}</span>
     <span class="note-headline-light note-headline-meta">
-      <span class="system-note-message" data-testid="system-note-content">
+      <span
+        v-if="$scopedSlots.default"
+        class="system-note-message"
+        :class="!isSystemNote && !emailParticipant && 'md:-gl-ml-2'"
+        data-testid="system-note-content"
+      >
         <slot></slot>
       </span>
       <template v-if="createdAt">

spec/rack_servers/puma_spec.rb

@@ -19,7 +19,13 @@ RSpec.describe 'Puma' do
 
     File.write(config_path, config_lines)
 
-    cmd = %W[puma -e test -C #{config_path} #{File.join(__dir__, 'configs/config.ru')}]
+    puma_path = begin
+      Gem.bin_path('puma', 'puma')
+    rescue StandardError
+    end
+    skip "Puma executable not found" unless puma_path
+
+    cmd = %W[#{puma_path} -e test -C #{config_path} #{File.join(__dir__, 'configs/config.ru')}]
     @puma_master_pid = spawn({ 'DISABLE_PUMA_WORKER_KILLER' => '1' }, *cmd)
     wait_puma_boot!(@puma_master_pid, File.join(project_root, 'tmp/tests/puma-worker-ready'))
     WebMock.allow_net_connect!
@@ -45,7 +51,7 @@ RSpec.describe 'Puma' do
 
   after(:all) do
     webmock_enable!
-    Process.kill('TERM', @puma_master_pid)
+    Process.kill('TERM', @puma_master_pid) if @puma_master_pid
   rescue Errno::ESRCH
   end