1 files changed, 144 insertions, 0 deletions
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
new file mode 100644
index 000000000000..523782b272f4
--- /dev/null
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -0,0 +1,144 @@
+--- Gemfile.orig	2018-06-21 15:14:17 UTC
++++ Gemfile
+@@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0'
+ gem 'default_value_for', gem_versions['default_value_for']
+ 
+ # Supported DBs
+-gem 'mysql2', '~> 0.4.10', group: :mysql
++gem 'mysql2', '>= 0.4.10', group: :mysql
+ 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
+ gem 'rufus-scheduler', '~> 3.4'
+ 
+ # HTTP requests
+-gem 'httparty', '~> 0.13.3'
++gem 'httparty', '>= 0.13.3'
+ 
+ # Colored output to console
+ gem 'rainbow', '~> 2.2'
+@@ -291,7 +291,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-pg', '~> 1.3.0', group: :postgres
+ gem 'peek-rblineprof', '~> 0.2.0'
+ gem 'peek-redis', '~> 1.2.0'
+@@ -299,96 +299,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
+ 
+ # Metrics
+ group :metrics do
+-  gem 'allocations', '~> 1.0', require: false, platform: :mri
+-  gem 'method_source', '~> 0.8', require: false
+-  gem 'influxdb', '~> 0.2', require: false
+-
+   # Prometheus
+   gem 'prometheus-client-mmap', '~> 0.9.3'
+   gem 'raindrops', '~> 0.18'
+ end
+ 
+-group :development do
+-  gem 'foreman', '~> 0.84.0'
+-  gem 'brakeman', '~> 4.2', require: false
+-
+-  gem 'letter_opener_web', '~> 1.3.0'
+-  gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
+-
+-  # Better errors handler
+-  gem 'better_errors', '~> 2.1.0'
+-  gem 'binding_of_caller', '~> 0.7.2'
+-
+-  # thin instead webrick
+-  gem 'thin', '~> 1.7.0'
+-end
+-
+-group :development, :test do
+-  gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
+-  gem 'pry-byebug', '~> 3.4.1', platform: :mri
+-  gem 'pry-rails', '~> 0.3.4'
+-
+-  gem 'awesome_print', require: false
+-  gem 'fuubar', '~> 2.2.0'
+-
+-  gem 'database_cleaner', '~> 1.5.0'
+-  gem 'factory_bot_rails', '~> 4.8.2'
+-  gem 'rspec-rails', '~> 3.6.0'
+-  gem 'rspec-retry', '~> 0.4.5'
+-  gem 'rspec_profiling', '~> 0.0.5'
+-  gem 'rspec-set', '~> 0.1.3'
+-  gem 'rspec-parameterized', require: false
+-
+-  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
+-  gem 'minitest', '~> 5.7.0'
+-
+-  # Generate Fake data
+-  gem 'ffaker', '~> 2.4'
+-
+-  gem 'capybara', '~> 2.15'
+-  gem 'capybara-screenshot', '~> 1.0.0'
+-  gem 'selenium-webdriver', '~> 3.12'
+-
+-  gem 'spring', '~> 2.0.0'
+-  gem 'spring-commands-rspec', '~> 1.0.4'
+-
+-  gem 'gitlab-styles', '~> 2.3', require: false
+-  # Pin these dependencies, otherwise a new rule could break the CI pipelines
+-  gem 'rubocop', '~> 0.52.1'
+-  gem 'rubocop-rspec', '~> 1.22.1'
+-
+-  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 'knapsack', '~> 1.16'
+-
+-  gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper']
+-
+-  gem 'stackprof', '~> 0.2.10', require: false
+-
+-  gem 'simple_po_parser', '~> 1.1.2', require: false
+-
+-  gem 'timecop', '~> 0.8.0'
+-end
+-
+-group :test do
+-  gem 'shoulda-matchers', '~> 3.1.2', require: false
+-  gem 'email_spec', '~> 2.2.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'
+-  gem 'test-prof', '~> 0.2.5'
+-end
+-
+ gem 'octokit', '~> 4.9'
+ 
+ gem 'mail_room', '~> 0.9.1'
+@@ -419,7 +334,7 @@ group :ed25519 do
+ end
+ 
+ # Gitaly GRPC client
+-gem 'gitaly-proto', '~> 0.100.0', require: 'gitaly'
++gem 'gitaly-proto', '~> 0.101.0', require: 'gitaly'
+ gem 'grpc', '~> 1.11.0'
+ 
+ # Locked until https://github.com/google/protobuf/issues/4210 is closed