Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/repository/components/table/row.vue

 <script>
-import { GlBadge, GlLink, GlSkeletonLoading } from '@gitlab/ui';
+import { GlBadge, GlLink, GlSkeletonLoading, GlTooltipDirective } from '@gitlab/ui';
 import { visitUrl } from '~/lib/utils/url_utility';
 import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
+import Icon from '~/vue_shared/components/icon.vue';
 import { getIconName } from '../../utils/icon';
 import getRefMixin from '../../mixins/get_ref';
 import getCommit from '../../queries/getCommit.query.graphql';
@@ -12,6 +13,10 @@ export default {
     GlLink,
     GlSkeletonLoading,
     TimeagoTooltip,
+    Icon,
+  },
+  directives: {
+    GlTooltip: GlTooltipDirective,
   },
   apollo: {
     commit: {
@@ -95,6 +100,9 @@ export default {
     shortSha() {
       return this.id.slice(0, 8);
     },
+    hasLockLabel() {
+      return this.commit && this.commit.lockLabel;
+    },
   },
   methods: {
     openRow(e) {
@@ -122,6 +130,14 @@ export default {
       <template v-if="isSubmodule">
         @ <gl-link :href="submoduleTreeUrl" class="commit-sha">{{ shortSha }}</gl-link>
       </template>
+      <icon
+        v-if="hasLockLabel"
+        v-gl-tooltip
+        :title="commit.lockLabel"
+        name="lock"
+        :size="12"
+        class="ml-2 vertical-align-middle"
+      />
     </td>
     <td class="d-none d-sm-table-cell tree-commit">
       <gl-link

app/assets/javascripts/repository/log_tree.js

@@ -14,6 +14,7 @@ export function normalizeData(data) {
     commitPath: d.commit_path,
     fileName: d.file_name,
     type: d.type,
+    lockLabel: d.lock_label,
     __typename: 'LogTreeCommit',
   }));
 }

app/assets/javascripts/repository/queries/getCommit.query.graphql

@@ -6,5 +6,6 @@ query getCommit($fileName: String!, $type: String!, $path: String!) {
     commitPath
     fileName
     type
+    lockLabel
   }
 }

app/assets/javascripts/repository/queries/getCommits.query.graphql

@@ -6,5 +6,6 @@ query getCommits {
     commitPath
     fileName
     type
+    lockLabel
   }
 }

changelogs/unreleased/fix-merge-train-is-not-refreshed-when-aborted.yml

+---
+title: Fix merge train is not refreshed when the system aborts/drops a merge request
+merge_request: 19763
+author:
+type: fixed

doc/api/deployments.md

@@ -62,6 +62,15 @@ Example of response
         "twitter": "",
         "website_url": "",
         "organization": ""
+      },
+      "pipeline": {
+        "created_at": "2016-08-11T02:12:10.222Z",
+        "id": 36,
+        "ref": "master",
+        "sha": "99d03678b90d914dbb1b109132516d71a4a03ea8",
+        "status": "success",
+        "updated_at": "2016-08-11T02:12:10.222Z",
+        "web_url": "http://gitlab.dev/root/project/pipelines/12"
       }
     },
     "environment": {
@@ -122,6 +131,15 @@ Example of response
         "twitter": "",
         "website_url": "",
         "organization": ""
+      },
+      "pipeline": {
+        "created_at": "2016-08-11T07:43:52.143Z",
+        "id": 37,
+        "ref": "master",
+        "sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
+        "status": "success",
+        "updated_at": "2016-08-11T07:43:52.143Z",
+        "web_url": "http://gitlab.dev/root/project/pipelines/13"
       }
     },
     "environment": {
@@ -219,6 +237,15 @@ Example of response
       "created_at": "2016-08-11T13:28:26.000+02:00",
       "message": "Merge branch 'rename-readme' into 'master'\r\n\r\nRename README\r\n\r\n\r\n\r\nSee merge request !2"
     },
+    "pipeline": {
+      "created_at": "2016-08-11T07:43:52.143Z",
+      "id": 42,
+      "ref": "master",
+      "sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
+      "status": "success",
+      "updated_at": "2016-08-11T07:43:52.143Z",
+      "web_url": "http://gitlab.dev/root/project/pipelines/5"
+    }
     "runner": null
   }
 }

doc/user/project/pages/custom_domains_ssl_tls_certification/index.md

@@ -169,6 +169,22 @@ from the GitLab project.
   in place: your domain will be periodically reverified, and may be
   disabled if the record is removed.
+##### Troubleshooting Pages domain verification
+
+To manually verify that you have properly configured the domain verification
+`TXT` DNS entry, you can run the following command in your terminal:
+
+```
+dig _gitlab-pages-verification-code.<YOUR-PAGES-DOMAIN> TXT
+```
+
+Expect the output:
+
+```
+;; ANSWER SECTION:
+_gitlab-pages-verification-code.<YOUR-PAGES-DOMAIN>. 300 IN TXT "gitlab-pages-verification-code=<YOUR-VERIFICATION-CODE>"
+```
+
 ### Adding more domain aliases
 You can add more than one alias (custom domains and subdomains) to the same project.

spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap

@@ -25,6 +25,8 @@ exports[`Repository table row component renders table row 1`] = `
     <!---->
      
     <!---->
+     
+    <!---->
   </td>
    
   <td

spec/frontend/repository/components/table/row_spec.js

@@ -2,6 +2,7 @@ import { shallowMount, RouterLinkStub } from '@vue/test-utils';
 import { GlBadge, GlLink } from '@gitlab/ui';
 import { visitUrl } from '~/lib/utils/url_utility';
 import TableRow from '~/repository/components/table/row.vue';
+import Icon from '~/vue_shared/components/icon.vue';
 jest.mock('~/lib/utils/url_utility');
@@ -156,4 +157,17 @@ describe('Repository table row component', () => {
     expect(vm.find('a').attributes('href')).toEqual('https://test.com');
     expect(vm.find(GlLink).attributes('href')).toEqual('https://test.com/commit');
   });
+
+  it('renders lock icon', () => {
+    factory({
+      id: '1',
+      path: 'test',
+      type: 'tree',
+      currentPath: '/',
+    });
+
+    vm.setData({ commit: { lockLabel: 'Locked by Root', committedDate: '2019-01-01' } });
+
+    expect(vm.find(Icon).exists()).toBe(true);
+  });
 });