diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 09:54:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 09:54:47 +0000 |
| commit | 9bf0c33b634f078e3b6419ec6d59297ebde34cc1 (patch) | |
| tree | cb704ed4e2e9835e771da07ada58c9370df64583 | |
| parent | 453396ed5b1e1a0f4eca6b3d575405229bf417fd (diff) | |
| download | gitlab-ce-9bf0c33b634f078e3b6419ec6d59297ebde34cc1.tar.gz | |
Add latest changes from gitlab-org/gitlab@12-5-stable-ee
| -rw-r--r-- | qa/Dockerfile | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/Java.gitignore | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile index 4845938b57e..e4b860b08b2 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -11,7 +11,7 @@ RUN echo "deb http://ftp.debian.org/debian stretch-backports main" >> /etc/apt/s # Update APT sources and install some dependencies # RUN sed -i "s/httpredir.debian.org/ftp.us.debian.org/" /etc/apt/sources.list -RUN apt-get update && apt-get install -y wget unzip xvfb +RUN apt-get update && apt-get install -y wget unzip xvfb lsb-release ## # Install some packages from backports diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore index 259148fa18f..259148fa18f 100755..100644 --- a/vendor/gitignore/C++.gitignore +++ b/vendor/gitignore/C++.gitignore diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore index a1c2a238a96..a1c2a238a96 100755..100644 --- a/vendor/gitignore/Java.gitignore +++ b/vendor/gitignore/Java.gitignore |