[DRE-commits] [gitlab] 01/04: don't overwrite existing db

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab.

commit 78cc74f3c5043a5233f51b1aa51260b53a2cdece
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Feb 12 15:10:19 2016 +0530

    don't overwrite existing db
---
 debian/changelog     | 6 ++++++
 debian/rake-tasks.sh | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index eddf464..973360e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gitlab (8.4.3+dfsg-4) UNRELEASED; urgency=medium
+
+  * Don't overwrite existing database (Closes: #814458) 
+
+ -- Pirate Praveen <praveen at debian.org>  Fri, 12 Feb 2016 15:08:08 +0530
+
 gitlab (8.4.3+dfsg-3) unstable; urgency=medium
 
   * Check if /run/systemd/system dirctory exist for systemd
diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index 9c518a1..8a65fe2 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -4,7 +4,7 @@
 for i in $(cat /etc/gitlab/gitlab-debian.conf); do export $i; done
 
 echo "Initializing database..."
-su ${gitlab_user} -s /bin/sh -c 'bundle exec rake gitlab:setup RAILS_ENV=production force=yes'
+su ${gitlab_user} -s /bin/sh -c 'bundle exec rake gitlab:setup RAILS_ENV=production'
 su ${gitlab_user} -s /bin/sh -c 'bundle exec rake gitlab:shell:install \
 REDIS_URL=redis://localhost:6379 \
 SHELL_ROOT_PATH=/usr/share/gitlab-shell RAILS_ENV=production'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git