From eadcbccc2053c8ccaa8eb407b6e8652d91232969 Mon Sep 17 00:00:00 2001
From: Praveen Arimbrathodiyil <praveen@debian.org>
Date: Thu, 26 Nov 2015 16:55:07 +0530
Subject: [PATCH] refresh patches for 8.1.0->8.2.1

---
 debian/patches/0003-loosen-doorkeeper.patch   |  2 +-
 debian/patches/0004-loosen-rack-oauth2.patch  |  2 +-
 .../0005-use-debian-omniauth-ldap.patch       |  2 +-
 debian/patches/0006-loosen-grape.patch        | 15 --------
 debian/patches/0012-loosen-stamp.patch        | 13 -------
 debian/patches/0013-loosen-enumerize.patch    |  2 +-
 debian/patches/0015-loosen-carrierwave.patch  |  2 +-
 debian/patches/0016-loosen-fog.patch          |  2 +-
 debian/patches/0017-loosen-redcarpet.patch    |  2 +-
 debian/patches/0018-loosen-rdoc.patch         |  2 +-
 debian/patches/0019-loosen-creole.patch       |  2 +-
 debian/patches/0020-loosen-unicorn.patch      |  2 +-
 debian/patches/0021-loosen-sidekiq.patch      |  2 +-
 debian/patches/0022-loosen-colorize.patch     |  2 +-
 debian/patches/0025-loosen-asana.patch        |  2 +-
 .../0027-loosen-underscore-rails.patch        |  2 +-
 debian/patches/0028-loosen-ace-rails-ap.patch |  2 +-
 debian/patches/0029-loosen-sass-rails.patch   |  4 +--
 .../0031-loosen-jquery-turbolinks.patch       |  2 +-
 debian/patches/0032-loosen-gon.patch          |  4 +--
 debian/patches/0033-jquery-atwho-rails.patch  | 13 -------
 debian/patches/0034-loosen-jquery-rails.patch |  4 +--
 .../patches/0035-loosen-jquery-ui-rails.patch |  4 +--
 .../patches/0036-loosen-nprogress-rails.patch | 13 -------
 .../patches/0037-loosen-request-store.patch   |  4 +--
 .../0100-remove-development-test.patch        | 23 ++++++------
 debian/patches/0101-disable-newrelic.patch    | 15 --------
 debian/patches/0102-loosen-octokit.patch      |  6 ++--
 debian/patches/0106-loosen-gollum-lib.patch   |  4 +--
 .../0200-switch-to-state-machine.patch        | 35 -------------------
 debian/patches/series                         |  6 ----
 31 files changed, 44 insertions(+), 151 deletions(-)
 delete mode 100644 debian/patches/0006-loosen-grape.patch
 delete mode 100644 debian/patches/0012-loosen-stamp.patch
 delete mode 100644 debian/patches/0033-jquery-atwho-rails.patch
 delete mode 100644 debian/patches/0036-loosen-nprogress-rails.patch
 delete mode 100644 debian/patches/0101-disable-newrelic.patch
 delete mode 100644 debian/patches/0200-switch-to-state-machine.patch

diff --git a/debian/patches/0003-loosen-doorkeeper.patch b/debian/patches/0003-loosen-doorkeeper.patch
index fa7dd295d7..70d7611c4d 100644
--- a/debian/patches/0003-loosen-doorkeeper.patch
+++ b/debian/patches/0003-loosen-doorkeeper.patch
@@ -10,4 +10,4 @@ Index: gitlab/Gemfile
 +gem 'doorkeeper',             '~> 2.1'
  gem 'omniauth',               '~> 1.2.2'
  gem 'omniauth-bitbucket',     '~> 0.0.2'
- gem 'omniauth-github',        '~> 1.1.1'
+ gem 'omniauth-facebook',      '~> 3.0.0'
diff --git a/debian/patches/0004-loosen-rack-oauth2.patch b/debian/patches/0004-loosen-rack-oauth2.patch
index 414167c7b1..cb8dafbea0 100644
--- a/debian/patches/0004-loosen-rack-oauth2.patch
+++ b/debian/patches/0004-loosen-rack-oauth2.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -27,7 +27,7 @@ gem 'omniauth-saml',          '~> 1.4.0'
+@@ -28,7 +28,7 @@ gem 'omniauth-saml',          '~> 1.4.0'
  gem 'omniauth-shibboleth',    '~> 1.2.0'
  gem 'omniauth-twitter',       '~> 1.2.0'
  gem 'omniauth_crowd'
diff --git a/debian/patches/0005-use-debian-omniauth-ldap.patch b/debian/patches/0005-use-debian-omniauth-ldap.patch
index a0b61633a1..d85f798a8a 100644
--- a/debian/patches/0005-use-debian-omniauth-ldap.patch
+++ b/debian/patches/0005-use-debian-omniauth-ldap.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -44,7 +44,7 @@ gem "gitlab_git", '~> 7.2.19'
+@@ -45,7 +45,7 @@ gem "gitlab_git", '~> 7.2.20'
  # LDAP Auth
  # GitLab fork with several improvements to original library. For full list of changes
  # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
diff --git a/debian/patches/0006-loosen-grape.patch b/debian/patches/0006-loosen-grape.patch
deleted file mode 100644
index 3544a1b87a..0000000000
--- a/debian/patches/0006-loosen-grape.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Forwarded: https://gitlab.com/gitlab-org/gitlab-ce/issues/2761
-
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -57,7 +57,7 @@ gem 'gollum-lib', '~> 4.0.2'
- gem "gitlab-linguist", "~> 3.0.1", require: "linguist"
- 
- # API
--gem 'grape',        '~> 0.6.1'
-+gem 'grape',        '~> 0.6'
- gem 'grape-entity', '~> 0.4.2'
- gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
- 
diff --git a/debian/patches/0012-loosen-stamp.patch b/debian/patches/0012-loosen-stamp.patch
deleted file mode 100644
index 5ea2da4d7d..0000000000
--- a/debian/patches/0012-loosen-stamp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -63,7 +63,7 @@ gem 'rack-cors',    '~> 0.4.0', require:
- 
- # Format dates and times
- # based on human-friendly examples
--gem "stamp", '~> 0.5.0'
-+gem "stamp", '~> 0.6.0'
- 
- # Enumeration fields
- gem 'enumerize', '~> 0.7.0'
diff --git a/debian/patches/0013-loosen-enumerize.patch b/debian/patches/0013-loosen-enumerize.patch
index bd913eee10..d2f2d79bb0 100644
--- a/debian/patches/0013-loosen-enumerize.patch
+++ b/debian/patches/0013-loosen-enumerize.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -66,7 +66,7 @@ gem 'rack-cors',    '~> 0.4.0', require:
+@@ -63,7 +63,7 @@ gem 'rack-cors',    '~> 0.4.0', require:
  gem "stamp", '~> 0.6.0'
  
  # Enumeration fields
diff --git a/debian/patches/0015-loosen-carrierwave.patch b/debian/patches/0015-loosen-carrierwave.patch
index d04473aedb..b0f73e38d2 100644
--- a/debian/patches/0015-loosen-carrierwave.patch
+++ b/debian/patches/0015-loosen-carrierwave.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -75,7 +75,7 @@ gem "kaminari", "~> 0.16.3"
+@@ -72,7 +72,7 @@ gem "kaminari", "~> 0.16.3"
  gem "haml-rails", '~> 0.9.0'
  
  # Files attachments
diff --git a/debian/patches/0016-loosen-fog.patch b/debian/patches/0016-loosen-fog.patch
index 81b7bf089a..bf5c12ee9a 100644
--- a/debian/patches/0016-loosen-fog.patch
+++ b/debian/patches/0016-loosen-fog.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -81,7 +81,7 @@ gem "carrierwave", '~> 0.10.0'
+@@ -78,7 +78,7 @@ gem "carrierwave", '~> 0.10.0'
  gem 'dropzonejs-rails', '~> 0.7.1'
  
  # for aws storage
diff --git a/debian/patches/0017-loosen-redcarpet.patch b/debian/patches/0017-loosen-redcarpet.patch
index 94bbf3f4b2..9290c1be3d 100644
--- a/debian/patches/0017-loosen-redcarpet.patch
+++ b/debian/patches/0017-loosen-redcarpet.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -94,7 +94,7 @@ gem "seed-fu", '~> 2.3.5'
+@@ -91,7 +91,7 @@ gem "seed-fu", '~> 2.3.5'
  gem 'html-pipeline', '~> 1.11.0'
  gem 'task_list',     '~> 1.0.2', require: 'task_list/railtie'
  gem 'github-markup', '~> 1.3.1'
diff --git a/debian/patches/0018-loosen-rdoc.patch b/debian/patches/0018-loosen-rdoc.patch
index be036d126e..6e3462051d 100644
--- a/debian/patches/0018-loosen-rdoc.patch
+++ b/debian/patches/0018-loosen-rdoc.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -96,7 +96,7 @@ gem 'task_list',     '~> 1.0.2', require
+@@ -93,7 +93,7 @@ gem 'task_list',     '~> 1.0.2', require
  gem 'github-markup', '~> 1.3.1'
  gem 'redcarpet',     '~> 3.2.3'
  gem 'RedCloth',      '~> 4.2.9'
diff --git a/debian/patches/0019-loosen-creole.patch b/debian/patches/0019-loosen-creole.patch
index 78c03e64d9..5d66efe392 100644
--- a/debian/patches/0019-loosen-creole.patch
+++ b/debian/patches/0019-loosen-creole.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -98,7 +98,7 @@ gem 'redcarpet',     '~> 3.2.3'
+@@ -95,7 +95,7 @@ gem 'redcarpet',     '~> 3.2.3'
  gem 'RedCloth',      '~> 4.2.9'
  gem 'rdoc',          '~> 4.1'
  gem 'org-ruby',      '~> 0.9.12'
diff --git a/debian/patches/0020-loosen-unicorn.patch b/debian/patches/0020-loosen-unicorn.patch
index bf924531df..da2583314b 100644
--- a/debian/patches/0020-loosen-unicorn.patch
+++ b/debian/patches/0020-loosen-unicorn.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -107,7 +107,7 @@ gem 'diffy', '~> 3.0.3'
+@@ -104,7 +104,7 @@ gem 'diffy', '~> 3.0.3'
  
  # Application server
  group :unicorn do
diff --git a/debian/patches/0021-loosen-sidekiq.patch b/debian/patches/0021-loosen-sidekiq.patch
index cc588119a7..b21072011e 100644
--- a/debian/patches/0021-loosen-sidekiq.patch
+++ b/debian/patches/0021-loosen-sidekiq.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -121,7 +121,7 @@ gem 'acts-as-taggable-on', '~> 3.4'
+@@ -118,7 +118,7 @@ gem 'acts-as-taggable-on', '~> 3.4'
  
  # Background jobs
  gem 'sinatra', '~> 1.4.4', require: nil
diff --git a/debian/patches/0022-loosen-colorize.patch b/debian/patches/0022-loosen-colorize.patch
index fddc7b0436..34cf1a8271 100644
--- a/debian/patches/0022-loosen-colorize.patch
+++ b/debian/patches/0022-loosen-colorize.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -129,7 +129,7 @@ gem "httparty", '~> 0.13.3'
+@@ -126,7 +126,7 @@ gem "httparty", '~> 0.13.3'
  
  # Colored output to console
  gem "colored", '~> 1.2'
diff --git a/debian/patches/0025-loosen-asana.patch b/debian/patches/0025-loosen-asana.patch
index b851c90188..988216767f 100644
--- a/debian/patches/0025-loosen-asana.patch
+++ b/debian/patches/0025-loosen-asana.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -157,7 +157,7 @@ gem "gemnasium-gitlab-service", "~> 0.2"
+@@ -154,7 +154,7 @@ gem "gemnasium-gitlab-service", "~> 0.2"
  gem "slack-notifier", "~> 1.2.0"
  
  # Asana integration
diff --git a/debian/patches/0027-loosen-underscore-rails.patch b/debian/patches/0027-loosen-underscore-rails.patch
index d9f687105b..a422203355 100644
--- a/debian/patches/0027-loosen-underscore-rails.patch
+++ b/debian/patches/0027-loosen-underscore-rails.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -169,7 +169,7 @@ gem 'd3_rails', '~> 3.5.5'
+@@ -166,7 +166,7 @@ gem 'd3_rails', '~> 3.5.5'
  gem "cal-heatmap-rails", "~> 0.0.1"
  
  # underscore-rails
diff --git a/debian/patches/0028-loosen-ace-rails-ap.patch b/debian/patches/0028-loosen-ace-rails-ap.patch
index 8147dab75d..1d8a673f20 100644
--- a/debian/patches/0028-loosen-ace-rails-ap.patch
+++ b/debian/patches/0028-loosen-ace-rails-ap.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -178,7 +178,7 @@ gem "sanitize", '~> 2.0'
+@@ -175,7 +175,7 @@ gem "sanitize", '~> 2.0'
  gem "rack-attack", '~> 4.3.0'
  
  # Ace editor
diff --git a/debian/patches/0029-loosen-sass-rails.patch b/debian/patches/0029-loosen-sass-rails.patch
index 4093f4c0ef..a203b6ade4 100644
--- a/debian/patches/0029-loosen-sass-rails.patch
+++ b/debian/patches/0029-loosen-sass-rails.patch
@@ -2,9 +2,9 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -186,7 +186,7 @@ gem 'mousetrap-rails', '~> 1.4.6'
+@@ -183,7 +183,7 @@ gem 'mousetrap-rails', '~> 1.4.6'
  # Detect and convert string character encoding
- gem 'charlock_holmes', '~> 0.6.9.4'
+ gem 'charlock_holmes', '~> 0.7.3'
  
 -gem "sass-rails", '~> 4.0.5'
 +gem "sass-rails", '~> 5.0.3'
diff --git a/debian/patches/0031-loosen-jquery-turbolinks.patch b/debian/patches/0031-loosen-jquery-turbolinks.patch
index c287414c32..bb90381022 100644
--- a/debian/patches/0031-loosen-jquery-turbolinks.patch
+++ b/debian/patches/0031-loosen-jquery-turbolinks.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -190,7 +190,7 @@ gem "sass-rails", '~> 5.0.3'
+@@ -187,7 +187,7 @@ gem "sass-rails", '~> 5.0.3'
  gem "coffee-rails", '~> 4.1.0'
  gem "uglifier", '~> 2.7.2'
  gem 'turbolinks', '~> 2.5.0'
diff --git a/debian/patches/0032-loosen-gon.patch b/debian/patches/0032-loosen-gon.patch
index 2825cbcceb..ac126b4aac 100644
--- a/debian/patches/0032-loosen-gon.patch
+++ b/debian/patches/0032-loosen-gon.patch
@@ -2,12 +2,12 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -196,7 +196,7 @@ gem 'addressable',        '~> 2.3.8'
+@@ -193,7 +193,7 @@ gem 'addressable',        '~> 2.3.8'
  gem 'bootstrap-sass',     '~> 3.0'
  gem 'font-awesome-rails', '~> 4.2'
  gem 'gitlab_emoji',       '~> 0.1'
 -gem 'gon',                '~> 5.0.0'
 +gem 'gon',                '~> 6.0.1'
- gem 'jquery-atwho-rails', '~> 1.0.0'
+ gem 'jquery-atwho-rails', '~> 1.3.2'
  gem 'jquery-rails',       '~> 3.1.3'
  gem 'jquery-scrollto-rails', '~> 1.4.3'
diff --git a/debian/patches/0033-jquery-atwho-rails.patch b/debian/patches/0033-jquery-atwho-rails.patch
deleted file mode 100644
index 99e75cf47f..0000000000
--- a/debian/patches/0033-jquery-atwho-rails.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -197,7 +197,7 @@ gem 'bootstrap-sass',     '~> 3.0'
- gem 'font-awesome-rails', '~> 4.2'
- gem 'gitlab_emoji',       '~> 0.1'
- gem 'gon',                '~> 6.0.1'
--gem 'jquery-atwho-rails', '~> 1.0.0'
-+gem 'jquery-atwho-rails', '~> 1.3.2'
- gem 'jquery-rails',       '~> 3.1.3'
- gem 'jquery-scrollto-rails', '~> 1.4.3'
- gem 'jquery-ui-rails',    '~> 4.2.1'
diff --git a/debian/patches/0034-loosen-jquery-rails.patch b/debian/patches/0034-loosen-jquery-rails.patch
index 75b0f0f213..3db6fed709 100644
--- a/debian/patches/0034-loosen-jquery-rails.patch
+++ b/debian/patches/0034-loosen-jquery-rails.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -198,7 +198,7 @@ gem 'font-awesome-rails', '~> 4.2'
+@@ -195,7 +195,7 @@ gem 'font-awesome-rails', '~> 4.2'
  gem 'gitlab_emoji',       '~> 0.1'
  gem 'gon',                '~> 6.0.1'
  gem 'jquery-atwho-rails', '~> 1.3.2'
@@ -10,4 +10,4 @@ Index: gitlab/Gemfile
 +gem 'jquery-rails',       '~> 4.0.4'
  gem 'jquery-scrollto-rails', '~> 1.4.3'
  gem 'jquery-ui-rails',    '~> 4.2.1'
- gem 'nprogress-rails',    '~> 0.1.2.3'
+ gem 'nprogress-rails',    '~> 0.1.6.7'
diff --git a/debian/patches/0035-loosen-jquery-ui-rails.patch b/debian/patches/0035-loosen-jquery-ui-rails.patch
index 259696d1fe..315b366a9f 100644
--- a/debian/patches/0035-loosen-jquery-ui-rails.patch
+++ b/debian/patches/0035-loosen-jquery-ui-rails.patch
@@ -2,13 +2,13 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -200,7 +200,7 @@ gem 'gon',                '~> 6.0.1'
+@@ -197,7 +197,7 @@ gem 'gon',                '~> 6.0.1'
  gem 'jquery-atwho-rails', '~> 1.3.2'
  gem 'jquery-rails',       '~> 4.0.4'
  gem 'jquery-scrollto-rails', '~> 1.4.3'
 -gem 'jquery-ui-rails',    '~> 4.2.1'
 +gem 'jquery-ui-rails',    '~> 5.0.5'
- gem 'nprogress-rails',    '~> 0.1.2.3'
+ gem 'nprogress-rails',    '~> 0.1.6.7'
  gem 'raphael-rails',      '~> 2.1.2'
  gem 'request_store',      '~> 1.2.0'
 Index: gitlab/app/assets/stylesheets/application.scss
diff --git a/debian/patches/0036-loosen-nprogress-rails.patch b/debian/patches/0036-loosen-nprogress-rails.patch
deleted file mode 100644
index 2426caca7c..0000000000
--- a/debian/patches/0036-loosen-nprogress-rails.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -201,7 +201,7 @@ gem 'jquery-atwho-rails', '~> 1.3.2'
- gem 'jquery-rails',       '~> 4.0.4'
- gem 'jquery-scrollto-rails', '~> 1.4.3'
- gem 'jquery-ui-rails',    '~> 5.0.5'
--gem 'nprogress-rails',    '~> 0.1.2.3'
-+gem 'nprogress-rails',    '~> 0.1.6.7'
- gem 'raphael-rails',      '~> 2.1.2'
- gem 'request_store',      '~> 1.2.0'
- gem 'select2-rails',      '~> 3.5.9'
diff --git a/debian/patches/0037-loosen-request-store.patch b/debian/patches/0037-loosen-request-store.patch
index a0f50a0de2..fed34bc1e6 100644
--- a/debian/patches/0037-loosen-request-store.patch
+++ b/debian/patches/0037-loosen-request-store.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -203,7 +203,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3'
+@@ -200,7 +200,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3'
  gem 'jquery-ui-rails',    '~> 5.0.5'
  gem 'nprogress-rails',    '~> 0.1.6.7'
  gem 'raphael-rails',      '~> 2.1.2'
@@ -11,7 +11,7 @@ Index: gitlab/Gemfile
  gem 'select2-rails',      '~> 3.5.9'
  gem 'virtus',             '~> 1.0.1'
  
-@@ -280,6 +280,11 @@ group :production do
+@@ -277,6 +277,11 @@ group :production do
    gem "gitlab_meta", '7.0'
  end
  
diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch
index a5d5ffec79..519d72305f 100644
--- a/debian/patches/0100-remove-development-test.patch
+++ b/debian/patches/0100-remove-development-test.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -207,84 +207,10 @@ gem 'request_store',      '~> 1.1'
+@@ -204,87 +204,6 @@ gem 'request_store',      '~> 1.1'
  gem 'select2-rails',      '~> 3.5.9'
  gem 'virtus',             '~> 1.0.1'
  
@@ -13,11 +13,9 @@ Index: gitlab/Gemfile
 -  gem "annotate", "~> 2.6.0"
 -  gem "letter_opener", '~> 1.1.2'
 -  gem 'quiet_assets', '~> 1.0.2'
--  gem 'rack-mini-profiler', '~> 0.9.0', require: false
 -  gem 'rerun', '~> 0.10.0'
 -  gem 'bullet', require: false
--  gem 'active_record_query_trace', require: false
--  gem 'rack-lineprof', platform: :mri
+-  gem 'rblineprof', platform: :mri, require: false
 -
 -  # Better errors handler
 -  gem 'better_errors', '~> 1.0.1'
@@ -63,6 +61,8 @@ Index: gitlab/Gemfile
 -  gem 'rubocop',  '~> 0.28.0',  require: false
 -  gem 'coveralls',  '~> 0.8.2', require: false
 -  gem 'simplecov', '~> 0.10.0', require: false
+-  gem 'flog', require: false
+-  gem 'flay', require: false
 -
 -  gem 'benchmark-ips', require: false
 -end
@@ -75,15 +75,18 @@ Index: gitlab/Gemfile
 -  gem 'sham_rack'
 -end
 -
- group :production do
-   gem "gitlab_meta", '7.0'
- end
- 
+-group :production do
+-  gem "gitlab_meta", '7.0'
+-end
+-
 -
 -roup :production do
 -  gem "gitlab_meta", '7.0'
 -end
 -
- gem "newrelic_rpm", '~> 3.9.4.245'
- gem 'newrelic-grape'
+-gem "newrelic_rpm", '~> 3.9.4.245'
+-gem 'newrelic-grape'
+-
+ gem 'octokit', '~> 3.7.0'
  
+ gem "mail_room", "~> 0.6.1"
diff --git a/debian/patches/0101-disable-newrelic.patch b/debian/patches/0101-disable-newrelic.patch
deleted file mode 100644
index 42c0722a54..0000000000
--- a/debian/patches/0101-disable-newrelic.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -211,8 +211,8 @@ roup :production do
-   gem "gitlab_meta", '7.0'
- end
- 
--gem "newrelic_rpm", '~> 3.9.4.245'
--gem 'newrelic-grape'
-+#gem "newrelic_rpm", '~> 3.9.4.245'
-+#gem 'newrelic-grape'
- 
- gem 'octokit', '~> 3.7.0'
- 
diff --git a/debian/patches/0102-loosen-octokit.patch b/debian/patches/0102-loosen-octokit.patch
index a0b0368bbb..fa9be229b7 100644
--- a/debian/patches/0102-loosen-octokit.patch
+++ b/debian/patches/0102-loosen-octokit.patch
@@ -2,9 +2,9 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -214,7 +214,7 @@ end
- #gem "newrelic_rpm", '~> 3.9.4.245'
- #gem 'newrelic-grape'
+@@ -204,7 +204,7 @@ gem 'request_store',      '~> 1.1'
+ gem 'select2-rails',      '~> 3.5.9'
+ gem 'virtus',             '~> 1.0.1'
  
 -gem 'octokit', '~> 3.7.0'
 +gem 'octokit', '~> 3.7'
diff --git a/debian/patches/0106-loosen-gollum-lib.patch b/debian/patches/0106-loosen-gollum-lib.patch
index 824048bc0f..8d16bff74e 100644
--- a/debian/patches/0106-loosen-gollum-lib.patch
+++ b/debian/patches/0106-loosen-gollum-lib.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -47,7 +47,7 @@ gem "gitlab_git", '~> 7.2.19'
+@@ -48,7 +48,7 @@ gem "gitlab_git", '~> 7.2.20'
  gem 'omniauth-ldap', '~> 1.0.4', require: "omniauth-ldap"
  
  # Git Wiki
@@ -10,4 +10,4 @@ Index: gitlab/Gemfile
 +gem 'gollum-lib', '~> 4.1.0'
  
  # Language detection
- # GitLab fork of linguist does not require pygments/python dependency.
+ gem "github-linguist", "~> 4.7.0", require: "linguist"
diff --git a/debian/patches/0200-switch-to-state-machine.patch b/debian/patches/0200-switch-to-state-machine.patch
deleted file mode 100644
index e5f355c7c8..0000000000
--- a/debian/patches/0200-switch-to-state-machine.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 2e5d32e07a75b98e57a0476a4cdb7a1ec41cadda Mon Sep 17 00:00:00 2001
-From: Pirate Praveen <praveen@debian.org>
-Date: Sun, 8 Nov 2015 12:15:58 -0500
-Subject: [PATCH] Switch to state_machines-activerecord (Fixes: #3374)
-
----
- Gemfile                                    | 2 +-
- config/initializers/state_machine_patch.rb | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -112,7 +112,7 @@ group :unicorn do
- end
- 
- # State machine
--gem "state_machine", '~> 1.2.0'
-+gem "state_machines-activerecord", '~> 0.3.0'
- # Run events after state machine commits
- gem 'after_commit_queue'
- 
-Index: gitlab/config/initializers/state_machine_patch.rb
-===================================================================
---- gitlab.orig/config/initializers/state_machine_patch.rb
-+++ gitlab/config/initializers/state_machine_patch.rb
-@@ -1,6 +1,6 @@
- # This is a patch to address the issue in https://github.com/pluginaweek/state_machine/issues/251
- # where gem 'state_machine' was not working for Rails 4.1
--module StateMachine
-+module StateMachines
-   module Integrations
-     module ActiveModel
-       public :around_validation
diff --git a/debian/patches/series b/debian/patches/series
index 6d5afacf88..277f478725 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,8 +3,6 @@ loosen-rails-version.patch
 0003-loosen-doorkeeper.patch
 0004-loosen-rack-oauth2.patch
 0005-use-debian-omniauth-ldap.patch
-0006-loosen-grape.patch
-0012-loosen-stamp.patch
 0013-loosen-enumerize.patch
 0015-loosen-carrierwave.patch
 0016-loosen-fog.patch
@@ -20,13 +18,9 @@ loosen-rails-version.patch
 0029-loosen-sass-rails.patch
 0031-loosen-jquery-turbolinks.patch
 0032-loosen-gon.patch
-0033-jquery-atwho-rails.patch
 0034-loosen-jquery-rails.patch
 0035-loosen-jquery-ui-rails.patch
-0036-loosen-nprogress-rails.patch
 0037-loosen-request-store.patch
 0100-remove-development-test.patch
-0101-disable-newrelic.patch
 0102-loosen-octokit.patch
 0106-loosen-gollum-lib.patch
-0200-switch-to-state-machine.patch