Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/diffs/components/diff_line_gutter_content.vue

@@ -72,7 +72,7 @@ export default {
     lineCode() {
       return (
         this.line.line_code ||
-        (this.line.left && this.line.line.left.line_code) ||
+        (this.line.left && this.line.left.line_code) ||
         (this.line.right && this.line.right.line_code)
       );
     },

app/assets/javascripts/diffs/store/utils.js

@@ -498,7 +498,7 @@ export const allDiscussionWrappersExpanded = diff => {
       }
     });
   } else if (diff.highlighted_diff_lines) {
-    diff.parallel_diff_lines.forEach(line => {
+    diff.highlighted_diff_lines.forEach(line => {
       if (line.discussions.length) {
         discussionsExpandedArray.push(line.discussionsExpanded);
       }

app/assets/javascripts/pipelines/components/graph/job_item.vue

@@ -111,7 +111,7 @@ export default {
       :href="status.details_path"
       :title="tooltipText"
       :class="cssClassJobName"
-      class="js-pipeline-graph-job-link qa-job-link"
+      class="js-pipeline-graph-job-link qa-job-link menu-item"
     >
       <job-name-component :name="job.name" :status="job.status" />
     </gl-link>

doc/user/project/operations/error_tracking.md

@@ -52,7 +52,8 @@ From error list, users can navigate to the error details page by clicking the ti
 This page has:
-- A link to Sentry issue.
+- A link to the Sentry issue.
 - A full stack trace along with other details.
-![Error Details](img/error_details_v12_5.png)
+- Ability to create an issue from a Sentry error.
+![Error Details](img/error_details_v12_6.png)

lib/gitlab/import_export/group_import_export.yml

@@ -14,9 +14,16 @@ tree:
         - :user
 included_attributes:
+  user:
+    - :id
+    - :email
+    - :username
+  author:
+    - :name
 excluded_attributes:
   group:
+    - :id
     - :runners_token
     - :runners_token_encrypted
@@ -25,6 +32,8 @@ methods:
     - :type
   badges:
     - :type
+  notes:
+    - :type
 preloads:
@@ -33,4 +42,11 @@ preloads:
 ee:
   tree:
     group:
-      - :epics
+      - epics:
+          - :parent
+          - notes:
+              - :author
+      - boards:
+          - :board_assignee
+          - labels:
+              - :priorities

locale/gitlab.pot

@@ -18257,6 +18257,21 @@ msgstr ""
 msgid "Threat Monitoring"
 msgstr ""
+msgid "ThreatMonitoring|A Web Application Firewall (WAF) provides monitoring and rules to protect production applications. GitLab adds the modsecurity WAF plug-in when you install the Ingress app in your Kubernetes cluster."
+msgstr ""
+
+msgid "ThreatMonitoring|The graph below is an overview of traffic coming to your application. View the documentation for instructions on how to access the WAF logs to see what type of malicious traffic is trying to access your app."
+msgstr ""
+
+msgid "ThreatMonitoring|Threat Monitoring"
+msgstr ""
+
+msgid "ThreatMonitoring|Threat Monitoring help page link"
+msgstr ""
+
+msgid "ThreatMonitoring|Web Application Firewall not enabled"
+msgstr ""
+
 msgid "Thursday"
 msgstr ""