diff options
author | Robert Speicher <rspeicher@gmail.com> | 2019-09-10 11:37:11 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2019-09-10 11:37:11 -0500 |
commit | 2434b5a977d251597c762cd784a0c422357f827b (patch) | |
tree | 871756699a823dfa36b6ffd6c8dbb1e1cd6c1495 | |
parent | 4c94eb24154f23396e1219a56e675822a726ff34 (diff) | |
download | gitlab-ce-rs-ee-gemfile.tar.gz |
Remove the `ee` Gemfile grouprs-ee-gemfile
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
-rw-r--r-- | Gemfile | 39 |
1 files changed, 20 insertions, 19 deletions
@@ -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 |