Merge branch 'master' into sh-headless-chrome-support

* master: (21 commits)
  Fix bottom spacing for dropdowns that open upwards
  Fix linting errors in sprintf
  regression with product labels
  Hide Gollum inside Gitlab::Git::Wiki
  Restore User.from_gitaly
  Added skeleton loading paradigm to UX guide
  Remove those tests as they're not needed anymore
  Resolve "Precompiled assets with digest strings are ignored in CI"
  Make the `QA:Page::Project::Show` driver less brittle
  Change index on ci_builds to optimize Jobs Controller
  Add basic sprintf implementation to JavaScript
  Expose GitLab features to the CI runner
  Hide CI section markers from job trace
  Freeze the constant array
  Just allow the scheme we want!
  Adapt to the latest addressable behaviour
  Strip before passing to addressable, otherwise it's invalid
  Make sure we didn't blow up if URI is invalid
  Only update gems we need
  ok
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/Gemfile b/Gemfile
index c0b2ed0595c..e2d52663250 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'