summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-12-16 18:03:24 -0200
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-12-16 18:03:24 -0200
commit785459d1617887ad8c3cd530c6cd79c33336fc41 (patch)
treeeaea702b7a427d14f4ffd689da23c6472e4f9b58 /Gemfile
parentdbe2ac8ccc07f53669214eb954489a6cb233d4e9 (diff)
parentb3d5ed62de3519b42dbcef2973c189467588fc36 (diff)
downloadgitlab-ce-785459d1617887ad8c3cd530c6cd79c33336fc41.tar.gz
Merge remote-tracking branch 'origin/master' into bitbucket-oauth2
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 7576f469a4c..bea31b53b1c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,7 @@ gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
gem 'github-linguist', '~> 4.7.0', require: 'linguist'
# API
-gem 'grape', '~> 0.15.0'
+gem 'grape', '~> 0.18.0'
gem 'grape-entity', '~> 0.6.0'
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
@@ -177,6 +177,9 @@ gem 'asana', '~> 0.4.0'
# FogBugz integration
gem 'ruby-fogbugz', '~> 0.2.1'
+# Kubernetes integration
+gem 'kubeclient', '~> 2.2.0'
+
# d3
gem 'd3_rails', '~> 3.5.0'