diff --git a/debian/patches/0018-loosen-rdoc.patch b/debian/patches/0018-loosen-rdoc.patch
index e2afdb0f53..e6a8440bec 100644
--- a/debian/patches/0018-loosen-rdoc.patch
+++ b/debian/patches/0018-loosen-rdoc.patch
@@ -1,11 +1,9 @@
 Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2814
 
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -104,7 +104,7 @@ gem 'deckar01-task_list', '1.0.5', requi
- gem 'gitlab-markup',      '~> 1.5.0'
+--- a/Gemfile
++++ b/Gemfile
+@@ -104,7 +104,7 @@
+ gem 'gitlab-markup',      '~> 1.5.1'
  gem 'redcarpet',          '~> 3.3.3'
  gem 'RedCloth',           '~> 4.3.2'
 -gem 'rdoc',               '~>3.6'
diff --git a/debian/patches/0042-relax-grape-entity.patch b/debian/patches/0042-relax-grape-entity.patch
deleted file mode 100644
index 3b7e59af42..0000000000
--- a/debian/patches/0042-relax-grape-entity.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-allow newer grape-entity already in debian
-
---- a/Gemfile
-+++ b/Gemfile
-@@ -68,7 +68,7 @@
- 
- # API
- gem 'grape',        '~> 0.15.0'
--gem 'grape-entity', '~> 0.4.2'
-+gem 'grape-entity', '~> 0.6.0'
- gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
- 
- # Pagination
diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch
index 6d633d6d4e..10a81c0620 100644
--- a/debian/patches/0050-relax-stable-libs.patch
+++ b/debian/patches/0050-relax-stable-libs.patch
@@ -1,10 +1,8 @@
 We should be able to update minor versions of stable libs without breaking
 gitlab Gemfile
 
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
+--- a/Gemfile
++++ b/Gemfile
 @@ -1,16 +1,16 @@
  source 'https://rubygems.org'
  
@@ -26,7 +24,7 @@ Index: gitlab/Gemfile
  
  # Supported DBs
  gem 'mysql2', '~> 0.3.16', group: :mysql
-@@ -18,22 +18,22 @@ gem 'pg', '~> 0.18.2', group: :postgres
+@@ -18,22 +18,22 @@
  
  # Authentication libraries
  gem 'devise',                 '~> 4.2'
@@ -61,7 +59,7 @@ Index: gitlab/Gemfile
  gem 'jwt'
  
  # Spam and anti-bot protection
-@@ -41,9 +41,9 @@ gem 'recaptcha', '~> 3.0', require: 'rec
+@@ -41,9 +41,9 @@
  gem 'akismet', '~> 2.0'
  
  # Two-factor authentication
@@ -73,7 +71,7 @@ Index: gitlab/Gemfile
  gem 'u2f', '~> 0.2.1'
  
  # Browser detection
-@@ -51,12 +51,12 @@ gem 'browser', '~> 2.2'
+@@ -51,12 +51,12 @@
  
  # Extracting information from a git repository
  # Provide access to Gitlab::Git library
@@ -88,7 +86,7 @@ Index: gitlab/Gemfile
  
  # Git Wiki
  # Required manually in config/initializers/gollum.rb to control load order
-@@ -64,7 +64,7 @@ gem 'gollum-lib', '~> 4.2', require: fal
+@@ -64,7 +64,7 @@
  gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
  
  # Language detection
@@ -97,7 +95,7 @@ Index: gitlab/Gemfile
  
  # API
  gem 'grape',        '~> 0.15.0'
-@@ -75,7 +75,7 @@ gem 'rack-cors',    '~> 0.4.0', require:
+@@ -75,7 +75,7 @@
  gem 'kaminari', '~> 0.17.0'
  
  # HAML
@@ -106,7 +104,7 @@ Index: gitlab/Gemfile
  
  # Files attachments
  gem 'carrierwave', '~> 0.10.0'
-@@ -96,39 +96,39 @@ gem 'fog-rackspace', '~> 0.1.1'
+@@ -96,39 +96,39 @@
  gem 'unf', '~> 0.1.4'
  
  # Seed data
@@ -116,20 +114,19 @@ Index: gitlab/Gemfile
  # Markdown and HTML processing
 -gem 'html-pipeline',      '~> 1.11.0'
 -gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie'
--gem 'gitlab-markup',      '~> 1.5.0'
+-gem 'gitlab-markup',      '~> 1.5.1'
 -gem 'redcarpet',          '~> 3.3.3'
 -gem 'RedCloth',           '~> 4.3.2'
 +gem 'html-pipeline',      '~> 1.11'
 +gem 'deckar01-task_list', '~> 1.0', '>= 1.0.5', require: 'task_list/railtie'
-+gem 'gitlab-markup',      '~> 1.5'
++gem 'gitlab-markup',      '~> 1.5', '>= 1.5.1'
 +gem 'redcarpet',          '~> 3.3', '>= 3.3.3'
 +gem 'RedCloth',           '~> 4.3', '>= 4.3.2'
  gem 'rdoc',               '~> 4.1'
  gem 'org-ruby',           '~> 0.9.12'
  gem 'creole',             '~> 0.5.0'
--gem 'wikicloth',          '0.8.1'
+ gem 'wikicloth',          '0.8.1'
 -gem 'asciidoctor',        '~> 1.5.2'
-+gem 'wikicloth',          '~> 0.8.1'
 +gem 'asciidoctor',        '~> 1.5', '>= 1.5.2'
  gem 'rouge',              '~> 2.0'
  gem 'truncato',           '~> 0.7.8'
@@ -158,7 +155,7 @@ Index: gitlab/Gemfile
  
  # Issue tags
  gem 'acts-as-taggable-on', '~> 4.0'
-@@ -136,39 +136,39 @@ gem 'acts-as-taggable-on', '~> 4.0'
+@@ -136,39 +136,39 @@
  # Background jobs
  gem 'sidekiq', '~> 4.2'
  gem 'sidekiq-cron', '~> 0.4.0'
@@ -206,7 +203,7 @@ Index: gitlab/Gemfile
  
  # Asana integration
  gem 'asana', '~> 0.4.0'
-@@ -177,64 +177,64 @@ gem 'asana', '~> 0.4.0'
+@@ -177,63 +177,63 @@
  gem 'ruby-fogbugz', '~> 0.2.1'
  
  # d3
@@ -256,18 +253,14 @@ Index: gitlab/Gemfile
 -gem 'sass-rails', '~> 5.0.6'
 -gem 'coffee-rails', '~> 4.1.0'
 -gem 'uglifier', '~> 2.7.2'
--gem 'turbolinks', '~> 2.5.0'
--gem 'jquery-turbolinks', '~> 2.1.0'
--
++gem 'sass-rails', '~> 5.0', '>= 5.0.6'
++gem 'coffee-rails', '~> 4.1'
++gem 'uglifier', '>= 2.7.2'
+ gem 'gitlab-turbolinks-classic', '~> 2.5', '>= 2.5.6'
+ 
 -gem 'addressable',        '~> 2.3.8'
 -gem 'bootstrap-sass',     '~> 3.3.0'
 -gem 'font-awesome-rails', '~> 4.6.1'
-+gem 'sass-rails', '~> 5.0', '>= 5.0.6'
-+gem 'coffee-rails', '~> 4.1'
-+gem 'uglifier', '~> 2.7', '>= 2.7.2'
-+gem 'turbolinks', '~> 2.5'
-+gem 'jquery-turbolinks', '~> 2.1'
-+
 +gem 'addressable',        '~> 2.3', '>= 2.3.8'
 +gem 'bootstrap-sass',     '~> 3.3'
 +gem 'font-awesome-rails', '~> 4.6', '>= 4.6.1'
@@ -298,7 +291,7 @@ Index: gitlab/Gemfile
  
  # Metrics
  group :metrics do
-@@ -324,7 +324,7 @@ end
+@@ -323,7 +323,7 @@
  
  gem 'newrelic_rpm', '~> 3.16'
  
@@ -307,7 +300,7 @@ Index: gitlab/Gemfile
  
  gem 'mail_room', '~> 0.8.1'
  
-@@ -333,18 +333,18 @@ gem 'email_reply_parser', '~> 0.5.8'
+@@ -332,18 +332,18 @@
  gem 'ruby-prof', '~> 0.16.2'
  
  ## CI
diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch
index 00e98dc4f8..279396d181 100644
--- a/debian/patches/0100-remove-development-test.patch
+++ b/debian/patches/0100-remove-development-test.patch
@@ -1,10 +1,8 @@
 Bundler will fail when it can't find these locally
 
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -243,87 +243,34 @@ group :metrics do
+--- a/Gemfile
++++ b/Gemfile
+@@ -242,87 +242,34 @@
    gem 'influxdb', '~> 0.2', require: false
  end
  
diff --git a/debian/patches/0210-use-jquery-ui-rails6.patch b/debian/patches/0210-use-jquery-ui-rails6.patch
index 42a1e70e7c..7ca47e7e40 100644
--- a/debian/patches/0210-use-jquery-ui-rails6.patch
+++ b/debian/patches/0210-use-jquery-ui-rails6.patch
@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -225,7 +225,7 @@
+@@ -224,7 +224,7 @@
  gem 'gon',                '~> 6.1'
  gem 'jquery-atwho-rails', '~> 1.3', '>= 1.3.2'
  gem 'jquery-rails',       '~> 4.1'
diff --git a/debian/patches/cve-2016-9469.diff b/debian/patches/cve-2016-9469.diff
deleted file mode 100644
index db9c25273a..0000000000
--- a/debian/patches/cve-2016-9469.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/app/finders/issuable_finder.rb
-+++ b/app/finders/issuable_finder.rb
-@@ -7,7 +7,7 @@
- #   current_user - which user use
- #   params:
- #     scope: 'created-by-me' or 'assigned-to-me' or 'all'
--#     state: 'open' or 'closed' or 'all'
-+#     state: 'opened' or 'closed' or 'all'
- #     group_id: integer
- #     project_id: integer
- #     milestone_title: string
-@@ -175,10 +175,13 @@
-   end
- 
-   def by_state(items)
--    params[:state] ||= 'all'
--
--    if items.respond_to?(params[:state])
--      items.public_send(params[:state])
-+    case params[:state].to_s
-+    when 'closed'
-+      items.closed
-+    when 'merged'
-+      items.respond_to?(:merged) ? items.merged : items.closed
-+    when 'opened'
-+      items.opened
-     else
-       items
-     end
diff --git a/debian/patches/series b/debian/patches/series
index 8d45c904c0..61a5a97327 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 0005-use-debian-omniauth-ldap.patch
 0018-loosen-rdoc.patch
-0042-relax-grape-entity.patch
 0050-relax-stable-libs.patch
 0100-remove-development-test.patch
 0108-make-mysql-optional.patch
@@ -8,5 +7,4 @@ source-init-functions.patch
 pid-log-paths.patch
 052-relax-grape.patch
 0200-remove-order-dependency-in-label-finder-spec.patch
-cve-2016-9469.diff
 0210-use-jquery-ui-rails6.patch