From abb5d0e6c02878a99dbf98316ea9439f8dc41f08 Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Mon, 23 Nov 2020 15:07:40 +0100
Subject: [PATCH] use bundler 2.1.4

---
 Changelog.md | 3 ++-
 Dockerfile   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 0d26ea6b..1acd2771 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,7 +8,8 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list
 - gitaly: upgrade v13.6.0
 - gitlab-shell: upgrade to v13.13.0
 - gitlab-pages: upgrade to v1.30.0
-- gitlab-workhorse: upgrade to v8.54.0    
+- gitlab-workhorse: upgrade to v8.54.0
+- use bundler 2.1.4
 
 **13.5.4**
 - gitlab: upgrade CE to v13.5.4
diff --git a/Dockerfile b/Dockerfile
index 3edeb669..c56afaf7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,7 +51,7 @@ RUN set -ex && \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
  && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \
- && gem install --no-document bundler -v 1.17.3 \
+ && gem install --no-document bundler -v 2.1.4 \
  && rm -rf /var/lib/apt/lists/*
 
 COPY assets/build/ ${GITLAB_BUILD_DIR}/