Add latest changes from gitlab-org/gitlab@master

.gitlab/merge_request_templates/Database changes.md

@@ -37,7 +37,7 @@ When adding foreign keys to existing tables:
 
 When adding tables:
 
-- [ ] Ordered columns based on the [Ordering Table Columns](https://docs.gitlab.com/ee/development/ordering_table_columns.html#ordering-table-columns) guidelines
+- [ ] Ordered columns based on the [Ordering Table Columns](https://docs.gitlab.com/ee/development/ordering_table_columns.html) guidelines
 - [ ] Added foreign keys to any columns pointing to data in other tables
 - [ ] Added indexes for fields that are used in statements such as `WHERE`, `ORDER BY`, `GROUP BY`, and `JOIN`s
 

.gitlab/merge_request_templates/Documentation.md

@@ -35,6 +35,6 @@ All reviewers can help ensure accuracy, clarity, completeness, and adherence to
 
 1. [ ] Review by assigned maintainer, who can always request/require the above reviews. Maintainer's review can occur before or after a technical writer review.
 1. [ ] Ensure a release milestone is set and that you merge the equivalent EE MR before the CE MR if both exist.
-1. [ ] If there has not been a technical writer review, [create an issue for one using the Doc Review template](https://gitlab.com/gitlab-org/gitlab-ce/issues/new?issuable_template=Doc%20Review).
+1. [ ] If there has not been a technical writer review, [create an issue for one using the Doc Review template](https://gitlab.com/gitlab-org/gitlab/issues/new?issuable_template=Doc%20Review).
 
 /label ~documentation

app/assets/javascripts/jobs/components/log/duration_badge.vue

@@ -9,5 +9,7 @@ export default {
 };
 </script>
 <template>
-  <div class="duration rounded align-self-start px-2 ml-2 flex-shrink-0">{{ duration }}</div>
+  <div class="log-duration-badge rounded align-self-start px-2 ml-2 flex-shrink-0">
+    {{ duration }}
+  </div>
 </template>

app/assets/javascripts/jobs/components/log/line.vue

@@ -19,7 +19,7 @@ export default {
 </script>
 
 <template>
-  <div class="line">
+  <div class="log-line">
     <line-number :line-number="line.lineNumber" :path="path" />
     <span v-for="(content, i) in line.content" :key="i" :class="content.style">{{
       content.text

app/assets/javascripts/jobs/components/log/line_header.vue

@@ -43,7 +43,7 @@ export default {
 
 <template>
   <div
-    class="line collapsible-line d-flex justify-content-between"
+    class="log-line collapsible-line d-flex justify-content-between"
     role="button"
     @click="handleOnClick"
   >

app/assets/stylesheets/framework/common.scss

@@ -387,6 +387,7 @@ img.emoji {
 .prepend-top-16 { margin-top: 16px; }
 .prepend-top-20 { margin-top: 20px; }
 .prepend-top-32 { margin-top: 32px; }
+.prepend-left-2 { margin-left: 2px; }
 .prepend-left-4 { margin-left: 4px; }
 .prepend-left-5 { margin-left: 5px; }
 .prepend-left-8 { margin-left: 8px; }

app/assets/stylesheets/framework/job_log.scss

@@ -11,7 +11,7 @@
   background-color: $builds-trace-bg;
 }
 
-.line {
+.log-line {
   padding: 1px $gl-padding 1px $job-log-line-padding;
 }
 
@@ -40,7 +40,7 @@
   }
 }
 
-.duration {
+.log-duration-badge {
   background: $gl-gray-400;
 }
 

changelogs/unreleased/10946-fix-the-following-style-lint-errors-and-warnings-for-ee-app-assets-.yml

@@ -0,0 +1,5 @@
+---
+title: Fix stylelint errors in epics.scss
+merge_request: 17243
+author:
+type: fixed

changelogs/unreleased/32408-fix-css-leak.yml

@@ -0,0 +1,5 @@
+---
+title: Fix CSS leak in job log
+merge_request:
+author:
+type: fixed

scripts/review_apps/base-config.yaml

@@ -40,6 +40,9 @@ gitlab:
       limits:
         cpu: 140m
         memory: 40M
+    maxReplicas: 3
+    hpa:
+      targetAverageValue: 130m
   sidekiq:
     resources:
       requests: