diff --git a/debian/changelog b/debian/changelog index d2dcee3074..de45a5a36b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gitlab (8.9.0+dfsg-2) unstable; urgency=medium + + * Reupload to unstable + * Relax omniauth-google-oauth2 in Gemfile + + -- Pirate Praveen Sat, 09 Jul 2016 20:14:24 +0530 + gitlab (8.9.0+dfsg-1) experimental; urgency=medium * New upstream release diff --git a/debian/patches/051-relax-omniauth-google-oauth2.patch b/debian/patches/051-relax-omniauth-google-oauth2.patch new file mode 100644 index 0000000000..0dead6746c --- /dev/null +++ b/debian/patches/051-relax-omniauth-google-oauth2.patch @@ -0,0 +1,13 @@ +Index: gitlab/Gemfile +=================================================================== +--- gitlab.orig/Gemfile ++++ gitlab/Gemfile +@@ -28,7 +28,7 @@ gem 'omniauth-cas3', '~> 1.1', + gem 'omniauth-facebook', '~> 3.0' + gem 'omniauth-github', '~> 1.1', '>= 1.1.1' + gem 'omniauth-gitlab', '~> 1.0' +-gem 'omniauth-google-oauth2', '~> 0.2.0' ++gem 'omniauth-google-oauth2', '~> 0.4.1' + gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos + gem 'omniauth-saml', '~> 1.5' + gem 'omniauth-shibboleth', '~> 1.2' diff --git a/debian/patches/series b/debian/patches/series index fe17ff4771..9e01c1bfe3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,6 +3,7 @@ 0018-loosen-rdoc.patch 0042-relax-grape-entity.patch 0050-relax-stable-libs.patch +051-relax-omniauth-google-oauth2.patch 0100-remove-development-test.patch 0108-make-mysql-optional.patch source-init-functions.patch