Add latest changes from gitlab-org/gitlab@master

changelogs/unreleased/georgekoltsov-add-award-emoji-to-notes-of-epics.yml

+---
+title: Add award emoji information of Epics and Epic Notes to Group Import/Export
+merge_request: 24003
+author:
+type: changed

doc/administration/geo/replication/version_specific_updates.md

@@ -4,6 +4,13 @@ Check this document if it includes instructions for the version you are updating
 These steps go together with the [general steps](updating_the_geo_nodes.md#general-update-steps)
 for updating Geo nodes.
 
+## Updating to GitLab 12.7
+
+DANGER: **Danger:**
+We found [an initialization order bug](https://gitlab.com/gitlab-org/gitlab/issues/199672) introduced in GitLab 12.7
+that causes Geo Secondaries to not set the correct database connection pool size. A [fix has been merged](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24021)
+and will be available in GitLab 12.8 and the next 12.7.x patch release. Please **do not upgrade to 12.7** until the fix is available.
+
 ## Updating to GitLab 12.2
 
 GitLab 12.2 includes the following minor PostgreSQL updates:

doc/administration/monitoring/prometheus/gitlab_metrics.md

@@ -83,6 +83,7 @@ The following metrics are available:
 | `upload_file_does_not_exist`                                   | Counter   | 10.7 in EE, 11.5 in CE | Number of times an upload record could not find its file                                            |                                                     |
 | `failed_login_captcha_total`                                   | Gauge     |                   11.0 | Counter of failed CAPTCHA attempts during login                                                     |                                                     |
 | `successful_login_captcha_total`                               | Gauge     |                   11.0 | Counter of successful CAPTCHA attempts during login                                                 |                                                     |
+| `auto_devops_pipelines_completed_total`                        | Counter   |                   12.7 | Counter of completed Auto DevOps pipelines, labeled by status                                       |                                                     |
 
 ## Metrics controlled by a feature flag
 

doc/development/auto_devops.md

@@ -40,3 +40,10 @@ found in
 
 Configuring [GDK for Auto
 DevOps](https://gitlab.com/gitlab-org/gitlab-development-kit/blob/master/doc/howto/auto_devops.md).
+
+## Monitoring on GitLab.com
+
+The metric
+[`auto_devops_completed_pipelines_total`](https://thanos-query.ops.gitlab.net/graph?g0.range_input=72h&g0.max_source_resolution=0s&g0.expr=sum(increase(auto_devops_pipelines_completed_total%7Benvironment%3D%22gprd%22%7D%5B60m%5D))%20by%20(status)&g0.tab=0)
+(only available to GitLab team members) counts completed Auto DevOps
+pipelines, labeled by status.

doc/development/feature_flags/development.md

@@ -24,8 +24,9 @@ end
 ```
 
 Features that are developed and are intended to be merged behind a feature flag
-should not include a changelog entry. The entry should be added in the merge
-request removing the feature flag. If the feature contains any DB migration it
+should not include a changelog entry. The entry should either be added in the merge
+request removing the feature flag or the merge request where the default value of
+the feature flag is set to true. If the feature contains any DB migration it
 should include a changelog entry for DB changes.
 
 In the rare case that you need the feature flag to be on automatically, use

lib/gitlab/import_export/group_import_export.yml

@@ -46,10 +46,12 @@ ee:
     group:
       - epics:
           - :parent
+          - :award_emoji
           - events:
               - :push_event_payload
           - notes:
               - :author
+              - :award_emoji
               - events:
                   - :push_event_payload
       - boards:

spec/fixtures/lib/gitlab/import_export/group_exports/complex/group.json

@@ -482,7 +482,18 @@
           "type": null,
           "author": {
             "name": "Administrator"
+          },
+          "award_emoji": [
+            {
+              "id": 12,
+              "name": "drum",
+              "user_id": 1,
+              "awardable_type": "Note",
+              "awardable_id": 44170,
+              "created_at": "2019-11-05T15:32:21.287Z",
+              "updated_at": "2019-11-05T15:32:21.287Z"
             }
+          ]
         },
         {
           "id": 44168,
@@ -574,6 +585,17 @@
             "name": "Administrator"
           }
         }
+      ],
+      "award_emoji": [
+        {
+          "id": 12,
+          "name": "thumbsup",
+          "user_id": 1,
+          "awardable_type": "Epic",
+          "awardable_id": 13622,
+          "created_at": "2019-11-05T15:37:21.287Z",
+          "updated_at": "2019-11-05T15:37:21.287Z"
+        }
       ]
     },
     {