Merge branch '11-9-stable-prepare-rc5' into '11-9-stable'

Prepare 11.9.0-rc5 release

See merge request gitlab-org/gitlab-ce!25991

.stylelintrc

@@ -102,6 +102,6 @@
       "selector-pseudo-element-no-unknown":true,
       "shorthand-property-no-redundant-values":true,
       "string-quotes":"single",
-      "value-no-vendor-prefix":true
+      "value-no-vendor-prefix":[true, { ignoreValues: ["sticky"] }]
    }
 }

app/assets/javascripts/emoji/index.js

@@ -3,6 +3,7 @@ import createFlash from '~/flash';
 import { s__ } from '~/locale';
 import emojiAliases from 'emojis/aliases.json';
 import axios from '../lib/utils/axios_utils';
+import csrf from '../lib/utils/csrf';
 
 import AccessorUtilities from '../lib/utils/accessor';
 
@@ -24,7 +25,14 @@ export function initEmojiMap() {
       resolve(emojiMap);
     } else {
       // We load the JSON from server
-      axios
+      const axiosInstance = axios.create();
+
+      // If the static JSON file is on a CDN we don't want to send the default CSRF token
+      if (gon.asset_host) {
+        delete axiosInstance.defaults.headers.common[csrf.headerKey];
+      }
+
+      axiosInstance
         .get(
           `${gon.asset_host || ''}${gon.relative_url_root ||
             ''}/-/emojis/${EMOJI_VERSION}/emojis.json`,

app/assets/stylesheets/framework/mixins.scss

@@ -259,6 +259,7 @@
   background: $gray-light;
   border: 1px solid $border-color;
   color: $gl-text-color;
+  position: -webkit-sticky;
   position: sticky;
   top: $header-height;
   padding: $grid-size;

app/assets/stylesheets/pages/diff.scss

@@ -9,6 +9,7 @@
     @media (min-width: map-get($grid-breakpoints, md)) {
       $mr-file-header-top: $mr-version-controls-height + $header-height + $mr-tabs-height;
 
+      position: -webkit-sticky;
       position: sticky;
       top: $mr-file-header-top;
       z-index: 102;
@@ -725,6 +726,7 @@
   }
 
   @include media-breakpoint-up(sm) {
+    position: -webkit-sticky;
     position: sticky;
     top: $header-height;
     background-color: $white-light;
@@ -1015,6 +1017,7 @@
 }
 
 .diff-tree-list {
+  position: -webkit-sticky;
   position: sticky;
   $top-pos: $header-height + $mr-tabs-height + $mr-version-controls-height + 10px;
   top: $header-height + $mr-tabs-height + $mr-version-controls-height + 10px;

app/assets/stylesheets/pages/merge_requests.scss

@@ -784,6 +784,7 @@
   }
 
   @include media-breakpoint-up(md) {
+    position: -webkit-sticky;
     position: sticky;
     top: $header-height + $mr-tabs-height;
     width: 100%;
@@ -810,6 +811,7 @@
   border-bottom: 1px solid $border-color;
 
   @include media-breakpoint-up(sm) {
+    position: -webkit-sticky;
     position: sticky;
   }
 

changelogs/unreleased/more-pgroup-fix.yml

+---
+title: Fix the last-ditch memory killer pgroup SIGKILL
+merge_request: 25940
+author:
+type: fixed

doc/ci/introduction/index.md

@@ -78,10 +78,10 @@ scripts to be specified in a file called [`.gitlab-ci.yml`](../yaml/README.md),
 located in the root path of your repository.
 
 In this file, you can define the scripts you want to run, define include and
-cache dependencies, choose what commands you want to run in sequence
+cache dependencies, choose commands you want to run in sequence
 and those you want to run in parallel, define where you want to
-deploy your app, and choose if you want to run the script automatically
-or if you want to trigger it manually. Once you're familiar with
+deploy your app, and specify whether you will want to run the scripts automatically
+or trigger any of them manually. Once you're familiar with
 GitLab CI/CD you can add more advanced steps into the configuration file.
 
 To add scripts to that file, you'll need to organize them in a
@@ -175,7 +175,7 @@ file, so we recommend you read through it to understand GitLab's CI/CD
 logic, and learn how to write your own script (or tweak an
 existing one) for any application.
 
-For an deep view of GitLab's CI/CD configuration options, check the
+For a deep view of GitLab's CI/CD configuration options, check the
 [`.gitlab-ci.yml` full reference](../yaml/README.md).
 
 ### GitLab CI/CD feature set

lib/gitlab/sidekiq_middleware/memory_killer.rb

@@ -63,7 +63,7 @@ def wait_and_signal_pgroup(time, signal, explanation)
         sleep(time)
 
         Sidekiq.logger.warn "sending Sidekiq worker PGRP-#{pid} #{signal} (#{explanation})"
-        Process.kill(signal, "-#{pid}")
+        Process.kill(signal, 0)
       end
 
       def wait_and_signal(time, signal, explanation)

spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb

@@ -54,7 +54,7 @@ def run
 
       expect(Process).to receive(:kill).with('SIGTSTP', pid).ordered
       expect(Process).to receive(:kill).with('SIGTERM', pid).ordered
-      expect(Process).to receive(:kill).with('SIGKILL', "-#{pid}").ordered
+      expect(Process).to receive(:kill).with('SIGKILL', 0).ordered
 
       run
     end