Merge branch 'cc-git-2-27-0' into 'master'

Moving to use of Git 2.27 version

See merge request gitlab-org/gitlab!33589

.gitlab-ci.yml

@@ -15,7 +15,7 @@ stages:
 # in cases where jobs require Docker-in-Docker, the job
 # definition must be extended with `.use-docker-in-docker`
 default:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34"
+  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.27-lfs-2.9-chrome-83-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34"
   tags:
     - gitlab-org
   # All jobs are interruptible by default

.gitlab/ci/frontend.gitlab-ci.yml

@@ -11,7 +11,7 @@
 
 .compile-assets-base:
   extends: .frontend-base
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-git-2.26-lfs-2.9-node-12.x-yarn-1.21-graphicsmagick-1.3.34
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-git-2.27-lfs-2.9-node-12.x-yarn-1.21-graphicsmagick-1.3.34
   stage: prepare
   script:
     - node --version

.gitlab/ci/global.gitlab-ci.yml

@@ -64,7 +64,7 @@
     policy: pull
 
 .use-pg11:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34"
+  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.27-lfs-2.9-chrome-83-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34"
   services:
     - name: postgres:11.6
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
@@ -73,7 +73,7 @@
     POSTGRES_HOST_AUTH_METHOD: trust
 
 .use-pg11-ee:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34"
+  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.27-lfs-2.9-chrome-83-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34"
   services:
     - name: postgres:11.6
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]

doc/install/installation.md

@@ -134,7 +134,7 @@ Make sure you have the right version of Git installed:
 # Install Git
 sudo apt-get install -y git-core
 
-# Make sure Git is version 2.26.2 or higher (minimal supported version is 2.24.0)
+# Make sure Git is version 2.27.0 or higher (minimal supported version is 2.25.0)
 git --version
 ```
 
@@ -181,9 +181,9 @@ sudo make install
 
 # Download and compile from source
 cd /tmp
-curl --remote-name --location --progress https://www.kernel.org/pub/software/scm/git/git-2.26.2.tar.gz
-echo 'e1c17777528f55696815ef33587b1d20f5eec246669f3b839d15dbfffad9c121  git-2.26.2.tar.gz' | shasum -a256 -c - && tar -xzf git-2.26.2.tar.gz
-cd git-2.26.2/
+curl --remote-name --location --progress https://www.kernel.org/pub/software/scm/git/git-2.27.0.tar.gz
+echo '77ded85cbe42b1ffdc2578b460a1ef5d23bcbc6683eabcafbb0d394dffe2e787  git-2.27.0.tar.gz' | shasum -a256 -c - && tar -xzf git-2.27.0.tar.gz
+cd git-2.27.0/
 ./configure --with-libpcre
 make prefix=/usr/local all
 

ee/spec/features/groups/audit_events_spec.rb

@@ -4,12 +4,12 @@ require 'spec_helper'
 
 RSpec.describe 'Groups > Audit Events', :js do
   let(:user) { create(:user) }
-  let(:pete) { create(:user, name: 'Pete') }
+  let(:alex) { create(:user, name: 'Alex') }
   let(:group) { create(:group) }
 
   before do
     group.add_owner(user)
-    group.add_developer(pete)
+    group.add_developer(alex)
     sign_in(user)
   end
 
@@ -43,7 +43,9 @@ RSpec.describe 'Groups > Audit Events', :js do
     it "appears in the group's audit events" do
       visit group_group_members_path(group)
 
-      group_member = group.members.find_by(user_id: pete)
+      wait_for_requests
+
+      group_member = group.members.find_by(user_id: alex)
 
       page.within "#group_member_#{group_member.id}" do
         click_button 'Developer'
@@ -57,7 +59,7 @@ RSpec.describe 'Groups > Audit Events', :js do
       page.within('#audits') do
         expect(page).to have_content 'Change access level from developer to maintainer'
         expect(page).to have_content(user.name)
-        expect(page).to have_content('Pete')
+        expect(page).to have_content('Alex')
       end
     end
   end

spec/frontend/jobs/components/log/mock_data.js

@@ -34,7 +34,7 @@ export const utilsMockData = [
     content: [
       {
         text:
-          'Using Docker executor with image dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.34',
+          'Using Docker executor with image dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.27-lfs-2.9-chrome-83-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34',
       },
     ],
     section: 'prepare-executor',