diff --git a/debian/changelog b/debian/changelog index 4003bff3c7..a1e12a649f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -gitlab (8.4.0+dfsg-1) UNRELEASED; urgency=medium +gitlab (8.4.0+dfsg-1) unstable; urgency=medium * New upstream release * Use su instead of sudo everywhere (Closes: #812951) * Add rake and ruby-sentry-raven as dependencies + * Remove patch 0107-relax-omniauth-facebook.patch - -- Pirate Praveen Fri, 29 Jan 2016 21:36:55 +0530 + -- Pirate Praveen Tue, 02 Feb 2016 19:28:45 +0530 gitlab (8.4.0+dfsg~rc2-4) unstable; urgency=medium diff --git a/debian/patches/0107-relax-omniauth-facebook.patch b/debian/patches/0107-relax-omniauth-facebook.patch deleted file mode 100644 index ddd187ce6f..0000000000 --- a/debian/patches/0107-relax-omniauth-facebook.patch +++ /dev/null @@ -1,17 +0,0 @@ -We can remove this patch when we update to 3.0 -. -We were waiting to test diaspora with 3.0 - -Index: gitlab/Gemfile -=================================================================== ---- gitlab.orig/Gemfile -+++ gitlab/Gemfile -@@ -25,7 +25,7 @@ gem 'omniauth', '~> 1.2.2' - gem 'omniauth-azure-oauth2', '~> 0.0.6' - gem 'omniauth-bitbucket', '~> 0.0.2' - gem 'omniauth-cas3', '~> 1.1.2' --gem 'omniauth-facebook', '~> 3.0.0' -+gem 'omniauth-facebook', '~> 2.0.1' - gem 'omniauth-github', '~> 1.1.1' - gem 'omniauth-gitlab', '~> 1.0.0' - gem 'omniauth-google-oauth2', '~> 0.2.0' diff --git a/debian/patches/series b/debian/patches/series index 42280f3643..a133913aa1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,6 +11,5 @@ loosen-rails-version.patch 0038-relax-net-ssh.patch 0100-remove-development-test.patch 0102-loosen-octokit.patch -0107-relax-omniauth-facebook.patch 0108-make-mysql-optional.patch source-init-functions.patch