diff --git a/debian/patches/0007-loosen-omniauth-google-oauth2.patch b/debian/patches/0007-loosen-omniauth-google-oauth2.patch deleted file mode 100644 index ddc1786287..0000000000 --- a/debian/patches/0007-loosen-omniauth-google-oauth2.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gitlab/Gemfile -=================================================================== ---- gitlab.orig/Gemfile -+++ gitlab/Gemfile -@@ -25,7 +25,7 @@ gem "pg", '~> 0.18.2', group: :postgres - gem "devise", '~> 3.5.1' - gem "devise-async", '~> 0.9.0' - gem 'omniauth', "~> 1.2.2" --gem 'omniauth-google-oauth2', '~> 0.2.5' -+gem 'omniauth-google-oauth2', '~> 0.2.4' - gem 'omniauth-twitter', '~> 1.0.1' - gem 'omniauth-github', '~> 1.1.1' - gem 'omniauth-shibboleth', '~> 1.1.1' diff --git a/debian/patches/0008-loosen-omniauth-twitter.patch b/debian/patches/0008-loosen-omniauth-twitter.patch deleted file mode 100644 index f1a9f0c40a..0000000000 --- a/debian/patches/0008-loosen-omniauth-twitter.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gitlab/Gemfile -=================================================================== ---- gitlab.orig/Gemfile -+++ gitlab/Gemfile -@@ -26,7 +26,7 @@ gem "devise", '~> 3.5.1' - gem "devise-async", '~> 0.9.0' - gem 'omniauth', "~> 1.2.2" - gem 'omniauth-google-oauth2', '~> 0.2.4' --gem 'omniauth-twitter', '~> 1.0.1' -+gem 'omniauth-twitter', '~> 1.0' - gem 'omniauth-github', '~> 1.1.1' - gem 'omniauth-shibboleth', '~> 1.1.1' - gem 'omniauth-kerberos', '~> 0.2.0', group: :kerberos diff --git a/debian/patches/0009-loosen-omniauth-shibboleth.patch b/debian/patches/0009-loosen-omniauth-shibboleth.patch deleted file mode 100644 index 62a7fea6aa..0000000000 --- a/debian/patches/0009-loosen-omniauth-shibboleth.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gitlab/Gemfile -=================================================================== ---- gitlab.orig/Gemfile -+++ gitlab/Gemfile -@@ -28,7 +28,7 @@ gem 'omniauth', "~> 1.2.2" - gem 'omniauth-google-oauth2', '~> 0.2.4' - gem 'omniauth-twitter', '~> 1.0' - gem 'omniauth-github', '~> 1.1.1' --gem 'omniauth-shibboleth', '~> 1.1.1' -+gem 'omniauth-shibboleth', '~> 1.2' - gem 'omniauth-kerberos', '~> 0.2.0', group: :kerberos - gem 'omniauth-gitlab', '~> 1.0.0' - gem 'omniauth-bitbucket', '~> 0.0.2' diff --git a/debian/patches/0010-loosen-omniauth-kerberos.patch b/debian/patches/0010-loosen-omniauth-kerberos.patch deleted file mode 100644 index 6aa54212c6..0000000000 --- a/debian/patches/0010-loosen-omniauth-kerberos.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gitlab/Gemfile -=================================================================== ---- gitlab.orig/Gemfile -+++ gitlab/Gemfile -@@ -29,7 +29,7 @@ gem 'omniauth-google-oauth2', '~> 0.2.4' - gem 'omniauth-twitter', '~> 1.0' - gem 'omniauth-github', '~> 1.1.1' - gem 'omniauth-shibboleth', '~> 1.2' --gem 'omniauth-kerberos', '~> 0.2.0', group: :kerberos -+gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos - gem 'omniauth-gitlab', '~> 1.0.0' - gem 'omniauth-bitbucket', '~> 0.0.2' - gem 'omniauth-saml', '~> 1.4.0' diff --git a/debian/patches/0011-loosen-rack-cors.patch b/debian/patches/0011-loosen-rack-cors.patch deleted file mode 100644 index 7ace63955e..0000000000 --- a/debian/patches/0011-loosen-rack-cors.patch +++ /dev/null @@ -1,15 +0,0 @@ -Forwarded: https://gitlab.com/gitlab-org/gitlab-ce/issues/2800 - -Index: gitlab/Gemfile -=================================================================== ---- gitlab.orig/Gemfile -+++ gitlab/Gemfile -@@ -67,7 +67,7 @@ gem "gitlab-linguist", "~> 3.0.1", requi - # API - gem "grape", "~> 0.6" - gem "grape-entity", "~> 0.4.2" --gem 'rack-cors', '~> 0.2.9', require: 'rack/cors' -+gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' - - # Format dates and times - # based on human-friendly examples diff --git a/debian/patches/0014-loosen-haml-rails.patch b/debian/patches/0014-loosen-haml-rails.patch deleted file mode 100644 index fcfe6be8b4..0000000000 --- a/debian/patches/0014-loosen-haml-rails.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gitlab/Gemfile -=================================================================== ---- gitlab.orig/Gemfile -+++ gitlab/Gemfile -@@ -80,7 +80,7 @@ gem 'enumerize', '~> 1.0.0' - gem "kaminari", "~> 0.15.1" - - # HAML --gem "haml-rails", '~> 0.5.3' -+gem "haml-rails", '~> 0.9.0' - - # Files attachments - gem "carrierwave", '~> 0.9.0' diff --git a/debian/patches/0023-loosen-tinder.patch b/debian/patches/0023-loosen-tinder.patch deleted file mode 100644 index c503bdb767..0000000000 --- a/debian/patches/0023-loosen-tinder.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gitlab/Gemfile -=================================================================== ---- gitlab.orig/Gemfile -+++ gitlab/Gemfile -@@ -149,7 +149,7 @@ gem 'version_sorter', '~> 2.0.0' - gem "redis-rails", '~> 4.0.0' - - # Campfire integration --gem 'tinder', '~> 1.9.2' -+gem 'tinder', '~> 1.10.0' - - # HipChat integration - gem 'hipchat', '~> 1.5.0' diff --git a/debian/patches/0024-loosen-slack-notifier.patch b/debian/patches/0024-loosen-slack-notifier.patch deleted file mode 100644 index ca8723994c..0000000000 --- a/debian/patches/0024-loosen-slack-notifier.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gitlab/Gemfile -=================================================================== ---- gitlab.orig/Gemfile -+++ gitlab/Gemfile -@@ -161,7 +161,7 @@ gem "gitlab-flowdock-git-hook", "~> 1.0. - gem "gemnasium-gitlab-service", "~> 0.2" - - # Slack integration --gem "slack-notifier", "~> 1.0.0" -+gem "slack-notifier", "~> 1.2.1" - - # Asana integration - gem 'asana', '~> 0.0.6' diff --git a/debian/patches/0030-loosen-uglifier.patch b/debian/patches/0030-loosen-uglifier.patch deleted file mode 100644 index 315a3e0797..0000000000 --- a/debian/patches/0030-loosen-uglifier.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gitlab/Gemfile -=================================================================== ---- gitlab.orig/Gemfile -+++ gitlab/Gemfile -@@ -195,7 +195,7 @@ gem 'charlock_holmes', '~> 0.6.9.4' - - gem "sass-rails", '~> 5.0.3' - gem "coffee-rails", '~> 4.1.0' --gem "uglifier", '~> 2.3.2' -+gem "uglifier", '~> 2.3' - gem 'turbolinks', '~> 2.5.0' - gem 'jquery-turbolinks', '~> 2.0.1' - diff --git a/debian/patches/0103-loosen-whenever.patch b/debian/patches/0103-loosen-whenever.patch deleted file mode 100644 index 6c4336a2f7..0000000000 --- a/debian/patches/0103-loosen-whenever.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gitlab/Gemfile -=================================================================== ---- gitlab.orig/Gemfile -+++ gitlab/Gemfile -@@ -233,7 +233,7 @@ gem 'activerecord-session_store', '~> 0. - gem "nested_form", '~> 0.3.2' - - # Scheduled --gem 'whenever', '~> 0.8.4', require: false -+gem 'whenever', '~> 0.9.4', require: false - - # OAuth - gem 'oauth2', '~> 1.0.0' diff --git a/debian/patches/0104-loosen-kaminari.patch b/debian/patches/0104-loosen-kaminari.patch deleted file mode 100644 index 00e71783e7..0000000000 --- a/debian/patches/0104-loosen-kaminari.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gitlab/Gemfile -=================================================================== ---- gitlab.orig/Gemfile -+++ gitlab/Gemfile -@@ -77,7 +77,7 @@ gem "stamp", '~> 0.6.0' - gem 'enumerize', '~> 1.0.0' - - # Pagination --gem "kaminari", "~> 0.15.1" -+gem "kaminari", "~> 0.16.3" - - # HAML - gem "haml-rails", '~> 0.9.0' diff --git a/debian/patches/0105-loosen-slim.patch b/debian/patches/0105-loosen-slim.patch deleted file mode 100644 index 216011dea5..0000000000 --- a/debian/patches/0105-loosen-slim.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gitlab/Gemfile -=================================================================== ---- gitlab.orig/Gemfile -+++ gitlab/Gemfile -@@ -126,7 +126,7 @@ gem "state_machine", '~> 1.2.0' - gem 'acts-as-taggable-on', '~> 3.4' - - # Background jobs --gem 'slim', '~> 2.0.2' -+gem 'slim', '~> 3.0.6' - gem 'sinatra', '~> 1.4.4', require: nil - gem 'sidekiq', '3.4.2' - gem 'sidetiq', '~> 0.6.3'