From 42275623d691dd82a6df1eea5e168e401fe1f97c Mon Sep 17 00:00:00 2001
From: Andrew Stuart <andrew.stuart2@gmail.com>
Date: Thu, 25 May 2017 10:25:11 -0700
Subject: [PATCH] Temporary workaround for omniauth Gemfile.lock
 incompatibility

---
 assets/build/install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 1dbc39b0e..cf94238c3 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -118,6 +118,7 @@ if [[ -d ${GEM_CACHE_DIR} ]]; then
   chown -R ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/vendor/cache
 fi
 
+exec_as_git bundle lock --update=omniauth-google-oauth2
 exec_as_git bundle install -j$(nproc) --deployment --without development test aws
 
 # make sure everything in ${GITLAB_HOME} is owned by ${GITLAB_USER} user