[DRE-commits] [gitlab] 01/01: remove devise-async.rb

[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 17de5f17908dc8893982d6f508de6b1349835cdb
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Jun 19 16:47:40 2016 +0530

    remove devise-async.rb
---
 debian/changelog     | 1 +
 debian/rake-tasks.sh | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 059b42f..82bf0d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ gitlab (8.9.0+dfsg~rc4-1) UNRELEASED; urgency=medium
   * New upstream release candidate
   * Refresh patches
   * Use jquery in place of jquery2 (debian has only jquery and it has same API)
+  * Remove /etc/gitlab/initializers/devise_async.rb (removed upstream)
 
  -- Pirate Praveen <praveen at debian.org>  Thu, 16 Jun 2016 21:51:02 +0530
 
diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index cbc78c6..8369be1 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -19,6 +19,9 @@ if ! [ -f "${gitlab_app_root}/config/secrets.yml" ]; then
 
 fi
 
+# Remove config files (already removed by upstream)
+rm -rf /etc/gitlab/initializers/devise_async.rb
+
 # Check if the db is already present
 if [ "$(LANG=C su postgres -c "psql gitlab_production -c \"\d\"")" = \
 "No relations found." ]; then

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