summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-09-26 01:19:59 +0900
committerShinya Maeda <shinya@gitlab.com>2017-09-26 01:19:59 +0900
commit5892ad8f2c201887878854d1945eba197b88f648 (patch)
tree1548bc72c9947b506648bce80afc750d893aed69 /Gemfile
parente2b195b2748c88e276163d44cdeff5b210f2522c (diff)
downloadgitlab-ce-5892ad8f2c201887878854d1945eba197b88f648.tar.gz
Bump google-api-client Gem from 0.8.6 to 0.13.6
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 50fb1bcd815..460d9a05292 100644
--- a/Gemfile
+++ b/Gemfile
@@ -105,7 +105,7 @@ gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.1.0'
# for Google storage
-gem 'google-api-client', '~> 0.8.6'
+gem 'google-api-client', '~> 0.13.6'
# for aws storage
gem 'unf', '~> 0.1.4'
@@ -239,7 +239,7 @@ gem 'rack-proxy', '~> 0.6.0'
gem 'sass-rails', '~> 5.0.6'
gem 'uglifier', '~> 2.7.2'
-gem 'addressable', '~> 2.3.8'
+gem 'addressable', '~> 2.5.2'
gem 'bootstrap-sass', '~> 3.3.0'
gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
@@ -356,7 +356,7 @@ end
group :test do
gem 'shoulda-matchers', '~> 3.1.2', require: false
gem 'email_spec', '~> 1.6.0'
- gem 'json-schema', '~> 2.6.2'
+ gem 'json-schema', '~> 2.8.0'
gem 'webmock', '~> 2.3.2'
gem 'test_after_commit', '~> 1.1'
gem 'sham_rack', '~> 1.3.6'