From 2434b5a977d251597c762cd784a0c422357f827b Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 10 Sep 2019 11:37:11 -0500
Subject: Remove the `ee` Gemfile group

Bundler will install any gem in at least one non-excluded group, meaning
using `--without ee` would still install `gssapi` from the `:kerberos`
group.

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32661#note_213583669
---
 Gemfile | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/Gemfile b/Gemfile
index e8174b3e8b0..05ac58a5874 100644
--- a/Gemfile
+++ b/Gemfile
@@ -447,22 +447,23 @@ gem 'lograge', '~> 0.5'
 gem 'grape_logging', '~> 1.7'
 
 # Gems used by EE-only functionality
-group :ee do
-  gem "gitlab-license", '~> 1.0', require: false
-
-  # Search
-  gem 'aws-sdk', '~> 2', require: false
-  gem 'elasticsearch-api', '5.0.3', require: false
-  gem 'elasticsearch-model', '~> 0.1.9', require: false
-  gem 'elasticsearch-rails', '~> 0.1.9', require: false
-  gem 'faraday_middleware-aws-signers-v4', require: false
-
-  # Kerberos authentication
-  gem 'gssapi', group: :kerberos, require: false
-
-  # DNS Lookup
-  gem 'net-dns', '~> 0.9.0', require: false
-
-  # NTP client
-  gem 'net-ntp', '~> 2.1.0', require: false
-end
+#
+# Gems below must set `require: false` and then be manually required before use
+# -----------------------------------------------------------------------------
+gem 'gitlab-license', '~> 1.0', require: false
+
+# Search
+gem 'aws-sdk', '~> 2', require: false
+gem 'elasticsearch-api', '5.0.3', require: false
+gem 'elasticsearch-model', '~> 0.1.9', require: false
+gem 'elasticsearch-rails', '~> 0.1.9', require: false
+gem 'faraday_middleware-aws-signers-v4', require: false
+
+# Kerberos authentication
+gem 'gssapi', group: :kerberos, require: false
+
+# DNS Lookup
+gem 'net-dns', '~> 0.9.0', require: false
+
+# NTP client
+gem 'net-ntp', '~> 2.1.0', require: false
-- 
cgit v1.2.1