[DRE-commits] [gitlab] 01/01: skip gitlab:shell:install

[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 7869d2a3f7bd97f983496c102a33f143e607c7e2
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Jul 20 20:13:31 2016 +0530

    skip gitlab:shell:install
---
 debian/changelog     | 4 +++-
 debian/rake-tasks.sh | 3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ec617af..53ddfc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 gitlab (8.9.0+dfsg-5) UNRELEASED; urgency=medium
 
-  * Tighten dependencies.
+  * Tighten dependencies
+  * Don't run gitlab:shell:install in postinst (Closes: #831877)
+    (installed config.yml works)
 
  -- Pirate Praveen <praveen at debian.org>  Thu, 14 Jul 2016 21:04:06 +0530
 
diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index f83bef8..dc1d902 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -25,9 +25,6 @@ if [ "$(LANG=C su postgres -c "psql gitlab_production -c \"\d\"")" = \
   echo "Initializing database..."
   su ${gitlab_user} -s /bin/sh -c 'bundle exec rake db:schema:load'
   su ${gitlab_user} -s /bin/sh -c 'bundle exec rake db:seed_fu'
-  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'
 else
   echo "gitlab_production database is not empty, skipping gitlab setup"
   su ${gitlab_user} -s /bin/sh -c 'bundle exec rake db:migrate'

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