From aff3e6f13440b39d35cafacc3e4c8333f15ef0ab Mon Sep 17 00:00:00 2001
From: Praveen Arimbrathodiyil <praveen@debian.org>
Date: Thu, 4 Feb 2016 14:49:51 +0530
Subject: [PATCH] remove Gemfile.lock if found

---
 debian/changelog | 3 ++-
 debian/postinst  | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ffcda10a1..1dcc70aa2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gitlab (8.4.0+dfsg-2) UNRELEASED; urgency=medium
 
-  * Add systemd units (Closes: #812841) 
+  * Add systemd units (Closes: #812841)
+  * Remove Gemfile.lock if found before bundle install (Closes: #813550)
 
  -- Pirate Praveen <praveen@debian.org>  Thu, 04 Feb 2016 13:34:56 +0530
 
diff --git a/debian/postinst b/debian/postinst
index 383cdf468f..e9a5d813b3 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -84,7 +84,10 @@ case "$1" in
 
 	# Adjust database privileges
 	. /usr/lib/gitlab/scripts/grantpriv.sh
-	
+
+	# Remove Gemfile.lock if present
+	rm -f ${gtilab_home}/Gemfile.lock
+
 	echo "Verifying we have all required libraries..."
 	su ${gitlab_user} -s /bin/sh -c	'bundle install --local'