Update www/gitlab-ce to version 11.3.0.

Changelog: https://about.gitlab.com/2018/09/22/gitlab-11-3-released/

Approved by:	mentors (implicit)

2 files changed, 12 insertions, 21 deletions

diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index d9fcb6578ef3..68a6966d7e76 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2018-08-22 22:40:32 UTC
+--- Gemfile.orig	2018-09-21 11:36:34 UTC
 +++ Gemfile
 @@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0'
  gem 'default_value_for', gem_versions['default_value_for']
@@ -9,16 +9,7 @@
  gem 'pg', '~> 0.18.2', group: :postgres
  
  gem 'rugged', '~> 0.27'
-@@ -123,7 +123,7 @@ gem 'fog-rackspace', '~> 0.1.1'
- gem 'fog-aliyun', '~> 0.2.0'
- 
- # for Google storage
--gem 'google-api-client', '~> 0.19.8'
-+gem 'google-api-client', '>= 0.19.8'
- 
- # for aws storage
- gem 'unf', '~> 0.1.4'
-@@ -177,7 +177,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req
+@@ -179,7 +179,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req
  gem 'rufus-scheduler', '~> 3.4'
  
  # HTTP requests
@@ -26,8 +17,8 @@
 +gem 'httparty', '>= 0.13.3'
  
  # Colored output to console
- gem 'rainbow', '~> 2.2'
-@@ -294,7 +294,7 @@ gem 'batch-loader', '~> 1.2.1'
+ gem 'rainbow', '~> 3.0'
+@@ -296,7 +296,7 @@ gem 'batch-loader', '~> 1.2.1'
  # Perf bar
  gem 'peek', '~> 1.0.1'
  gem 'peek-gc', '~> 0.0.2'
@@ -36,7 +27,7 @@
  gem 'peek-pg', '~> 1.3.0', group: :postgres
  gem 'peek-rblineprof', '~> 0.2.0'
  gem 'peek-redis', '~> 1.2.0'
-@@ -302,96 +302,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
+@@ -304,96 +304,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
  
  # Metrics
  group :metrics do
@@ -101,12 +92,11 @@
 -  gem 'scss_lint', '~> 0.56.0', require: false
 -  gem 'haml_lint', '~> 0.26.0', require: false
 -  gem 'simplecov', '~> 0.14.0', require: false
--  gem 'flay', '~> 2.10.0', require: false
 -  gem 'bundler-audit', '~> 0.5.0', require: false
 -
 -  gem 'benchmark-ips', '~> 2.3.0', require: false
 -
--  gem 'license_finder', '~> 3.1', require: false
+-  gem 'license_finder', '~> 5.4', require: false
 -  gem 'knapsack', '~> 1.16'
 -
 -  gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper']
@@ -128,6 +118,7 @@
 -  gem 'sham_rack', '~> 1.3.6'
 -  gem 'concurrent-ruby', '~> 1.0.5'
 -  gem 'test-prof', '~> 0.2.5'
+-  gem 'rspec_junit_formatter'
 -end
 -
  gem 'octokit', '~> 4.9'
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example
index 99b75ea196d0..d4c498bbc6b8 100644
--- a/www/gitlab-ce/files/patch-config_gitlab.yml.example
+++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example
@@ -1,4 +1,4 @@
---- config/gitlab.yml.example.orig	2018-08-22 22:40:32 UTC
+--- config/gitlab.yml.example.orig	2018-09-21 11:36:34 UTC
 +++ config/gitlab.yml.example
 @@ -223,7 +223,7 @@ production: &base
      # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages
@@ -9,7 +9,7 @@
  
    ## Mattermost
    ## For enabling Add to Mattermost button
-@@ -582,7 +582,7 @@ production: &base
+@@ -585,7 +585,7 @@ production: &base
    # Gitaly settings
    gitaly:
      # Path to the directory containing Gitaly client executables.
@@ -18,7 +18,7 @@
      # Default Gitaly authentication token. Can be overriden per storage. Can
      # be left blank when Gitaly is running locally on a Unix socket, which
      # is the normal way to deploy Gitaly.
-@@ -600,8 +600,8 @@ production: &base
+@@ -603,8 +603,8 @@ production: &base
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
@@ -29,7 +29,7 @@
          # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
  
    ## Backup settings
-@@ -629,12 +629,12 @@ production: &base
+@@ -632,12 +632,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -45,7 +45,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -655,7 +655,7 @@ production: &base
+@@ -658,7 +658,7 @@ production: &base
    # CAUTION!
    # Use the default values unless you really know what you are doing
    git: