1 files changed, 9 insertions, 13 deletions
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 3c99e67715d8..e2dba50624b8 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2018-05-28 11:47:11 UTC
+--- Gemfile.orig	2018-06-20 17:48:20 UTC
 +++ Gemfile
 @@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0'
  gem 'default_value_for', gem_versions['default_value_for']
@@ -9,7 +9,7 @@
  gem 'pg', '~> 0.18.2', group: :postgres
  
  gem 'rugged', '~> 0.27'
-@@ -125,7 +125,7 @@ gem 'fog-rackspace', '~> 0.1.1'
+@@ -118,7 +118,7 @@ gem 'fog-rackspace', '~> 0.1.1'
  gem 'fog-aliyun', '~> 0.2.0'
  
  # for Google storage
@@ -18,7 +18,7 @@
  
  # for aws storage
  gem 'unf', '~> 0.1.4'
-@@ -176,7 +176,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req
+@@ -169,7 +169,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req
  gem 'rufus-scheduler', '~> 3.4'
  
  # HTTP requests
@@ -27,7 +27,7 @@
  
  # Colored output to console
  gem 'rainbow', '~> 2.2'
-@@ -226,7 +226,7 @@ gem 'kubeclient', '~> 3.0'
+@@ -222,7 +222,7 @@ gem 'kubeclient', '~> 3.0'
  gem 'd3_rails', '~> 3.5.0'
  
  # Sanitize user input
@@ -36,16 +36,16 @@
  gem 'babosa', '~> 1.0.2'
  
  # Sanitizes SVG input
-@@ -288,7 +288,7 @@ gem 'batch-loader', '~> 1.2.1'
+@@ -284,7 +284,7 @@ gem 'batch-loader', '~> 1.2.1'
  # Perf bar
  gem 'peek', '~> 1.0.1'
  gem 'peek-gc', '~> 0.0.2'
 -gem 'peek-mysql2', '~> 1.1.0', group: :mysql
 +gem 'peek-mysql2', '>= 1.1.0', group: :mysql
- gem 'peek-performance_bar', '~> 1.3.0'
  gem 'peek-pg', '~> 1.3.0', group: :postgres
  gem 'peek-rblineprof', '~> 0.2.0'
-@@ -297,98 +297,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
+ gem 'peek-redis', '~> 1.2.0'
+@@ -292,99 +292,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
  
  # Metrics
  group :metrics do
@@ -54,7 +54,7 @@
 -  gem 'influxdb', '~> 0.2', require: false
 -
    # Prometheus
-   gem 'prometheus-client-mmap', '~> 0.9.1'
+   gem 'prometheus-client-mmap', '~> 0.9.3'
    gem 'raindrops', '~> 0.18'
  end
  
@@ -135,6 +135,7 @@
 -  gem 'email_spec', '~> 1.6.0'
 -  gem 'json-schema', '~> 2.8.0'
 -  gem 'webmock', '~> 2.3.2'
+-  gem 'rails-controller-testing' if rails5? # Rails5 only gem.
 -  gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0.
 -  gem 'sham_rack', '~> 1.3.6'
 -  gem 'concurrent-ruby', '~> 1.0.5'
@@ -144,8 +145,3 @@
  gem 'octokit', '~> 4.8'
  
  gem 'mail_room', '~> 0.9.1'
-@@ -439,3 +352,4 @@ gem 'grape_logging', '~> 1.7'
- 
- # Asset synchronization
- gem 'asset_sync', '~> 2.2.0'
-+