diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-16 18:03:24 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-16 18:03:24 -0200 |
| commit | 785459d1617887ad8c3cd530c6cd79c33336fc41 (patch) | |
| tree | eaea702b7a427d14f4ffd689da23c6472e4f9b58 /Gemfile | |
| parent | dbe2ac8ccc07f53669214eb954489a6cb233d4e9 (diff) | |
| parent | b3d5ed62de3519b42dbcef2973c189467588fc36 (diff) | |
| download | gitlab-ce-785459d1617887ad8c3cd530c6cd79c33336fc41.tar.gz | |
Merge remote-tracking branch 'origin/master' into bitbucket-oauth2
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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' |