Added some more deps and remove them from the patch that removes the gems from the Gemfile.

As no new functionality is added, no version bump is required.

2 files changed, 3 insertions, 11 deletions

diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 0c8b8f52e9bc..c33c91c1089e 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -170,6 +170,8 @@ MY_DEPENDS=	git>=2.16.2:devel/git \
 	rubygem-peek-gc-rails50>=0.0.2:devel/rubygem-peek-gc-rails50 \
 	rubygem-peek-rblineprof-rails50>=0.2.0:devel/rubygem-peek-rblineprof-rails50 \
 	rubygem-peek-redis-rails50>=1.2.0:devel/rubygem-peek-redis-rails50 \
+	rubygem-method_source>=0.8:devel/rubygem-method_source \
+	rubygem-influxdb>=0.2:databases/rubygem-influxdb \
 	rubygem-prometheus-client-mmap>=0.9.4:devel/rubygem-prometheus-client-mmap \
 	rubygem-opentracing04>=0.4.3:devel/rubygem-opentracing04 \
 	rubygem-jaeger-client>=0.10.0:devel/rubygem-jaeger-client \
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index 6cee6306bfe5..7fca5c31e349 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -18,17 +18,7 @@
  
  # JIRA integration
  gem 'jira-ruby', '~> 1.4'
-@@ -293,9 +293,6 @@ gem 'peek-redis', '~> 1.2.0'
- 
- # Metrics
- group :metrics do
--  gem 'method_source', '~> 0.8', require: false
--  gem 'influxdb', '~> 0.2', require: false
--
-   # Prometheus
-   gem 'prometheus-client-mmap', '~> 0.9.4'
-   gem 'raindrops', '~> 0.18'
-@@ -305,87 +302,6 @@ group :tracing do
+@@ -305,87 +305,6 @@ group :tracing do
    # OpenTracing
    gem 'opentracing', '~> 0.4.3'
    gem 'jaeger-client', '~> 0.10.0'