From 5892ad8f2c201887878854d1945eba197b88f648 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Tue, 26 Sep 2017 01:19:59 +0900 Subject: Bump google-api-client Gem from 0.8.6 to 0.13.6 --- Gemfile | 6 +- Gemfile.lock | 340 +++++++++++++++++++++++++++++------------------------------ 2 files changed, 173 insertions(+), 173 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' diff --git a/Gemfile.lock b/Gemfile.lock index 4b2f86fe48d..a741651f0a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: RedCloth (4.3.2) abstract_type (0.0.7) - ace-rails-ap (4.1.2) + ace-rails-ap (4.1.3) actionmailer (4.2.8) actionpack (= 4.2.8) actionview (= 4.2.8) @@ -45,7 +45,8 @@ GEM adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) - addressable (2.3.8) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) akismet (2.0.0) allocations (1.0.5) arel (6.0.4) @@ -54,21 +55,16 @@ GEM faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.3) + asciidoctor (1.5.6.1) asciidoctor-plantuml (0.0.7) asciidoctor (~> 1.5) ast (2.3.0) atomic (1.1.99) attr_encrypted (3.0.3) encryptor (~> 3.0.0) - attr_required (1.0.0) - autoparse (0.3.3) - addressable (>= 2.3.1) - extlib (>= 0.9.15) - multi_json (>= 1.0.0) - autoprefixer-rails (6.2.3) + attr_required (1.0.1) + autoprefixer-rails (7.1.4.1) execjs - json awesome_print (1.2.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -83,15 +79,15 @@ GEM coderay (>= 1.0.0) erubis (>= 2.6.6) rack (>= 0.9.0) - bindata (2.3.5) + bindata (2.4.1) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (3.3.6) + bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) bootstrap_form (2.7.0) - brakeman (3.6.1) - browser (2.2.0) + brakeman (3.6.2) + browser (2.5.1) builder (3.2.3) bullet (5.5.1) activesupport (>= 3.0.0) @@ -107,25 +103,24 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.14) + capybara-screenshot (1.0.17) capybara (>= 1.0, < 3) launchy carrierwave (1.1.0) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - cause (0.1) charlock_holmes (0.7.5) chronic (0.10.2) chronic_duration (0.10.6) numerizer (~> 0.1.1) - chunky_png (1.3.5) + chunky_png (1.3.8) citrus (3.0.2) cliver (0.3.2) - coderay (1.1.1) + coderay (1.1.2) coercible (1.0.0) descendants_tracker (~> 0.0.1) - colorize (0.7.7) + colorize (0.8.1) concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) @@ -136,24 +131,26 @@ GEM crack (0.4.3) safe_yaml (~> 1.0.0) creole (0.5.0) - css_parser (1.5.0) + css_parser (1.6.0) addressable - d3_rails (3.5.11) + d3_rails (3.5.17) railties (>= 3.1.0) - daemons (1.2.3) + daemons (1.2.4) database_cleaner (1.5.3) - debug_inspector (0.0.2) + debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) deckar01-task_list (2.0.0) html-pipeline + declarative (0.0.10) + declarative-option (0.1.0) default_value_for (3.0.2) activerecord (>= 3.2.0, < 5.1) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.2.0) + devise (4.3.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) + railties (>= 4.1.0, < 5.2) responders warden (~> 1.2.3) devise-two-factor (3.0.0) @@ -165,16 +162,16 @@ GEM diff-lcs (1.3) diffy (3.1.0) docile (1.1.5) - domain_name (0.5.20161021) + domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) - doorkeeper (4.2.0) + doorkeeper (4.2.6) railties (>= 4.2) doorkeeper-openid_connect (1.1.2) doorkeeper (~> 4.0) json-jwt (~> 1.6) - dropzonejs-rails (0.7.2) + dropzonejs-rails (0.7.4) rails (> 3.1) - email_reply_trimmer (0.1.6) + email_reply_trimmer (0.1.8) email_spec (1.6.0) launchy (~> 2.1) mail (~> 2.2) @@ -182,27 +179,26 @@ GEM equalizer (0.0.11) erubis (2.7.0) escape_utils (1.1.1) - et-orbi (1.0.3) + et-orbi (1.0.5) tzinfo - eventmachine (1.0.8) - excon (0.57.1) - execjs (2.6.0) + eventmachine (1.2.5) + excon (0.59.0) + execjs (2.7.0) expression_parser (0.9.0) - extlib (0.9.16) factory_girl (4.7.0) activesupport (>= 3.0.0) factory_girl_rails (4.7.0) factory_girl (~> 4.7.0) railties (>= 3.0.0) - faraday (0.12.1) + faraday (0.12.2) multipart-post (>= 1.2, < 3) - faraday_middleware (0.11.0.1) + faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) faraday_middleware-multi_json (0.0.6) faraday_middleware multi_json - fast_gettext (1.4.0) - ffaker (2.4.0) + fast_gettext (1.5.1) + ffaker (2.7.0) ffi (1.9.18) flay (2.8.1) erubis (~> 2.7.0) @@ -221,29 +217,29 @@ GEM fog-json (~> 1.0) ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (1.4.0) + fog-aws (1.4.1) fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.44.3) + fog-core (1.45.0) builder - excon (~> 0.49) + excon (~> 0.58) formatador (~> 0.2) - fog-google (0.5.3) + fog-google (0.5.5) fog-core fog-json fog-xml fog-json (1.0.2) fog-core (~> 1.0) multi_json (~> 1.10) - fog-local (0.3.1) + fog-local (0.4.0) fog-core (~> 1.27) fog-openstack (0.1.21) fog-core (>= 1.40) fog-json (>= 1.0) ipaddress (>= 0.8) - fog-rackspace (0.1.1) + fog-rackspace (0.1.5) fog-core (>= 1.35) fog-json (>= 1.0) fog-xml (>= 0.1) @@ -251,8 +247,8 @@ GEM fog-xml (0.1.3) fog-core nokogiri (>= 1.5.11, < 2.0.0) - font-awesome-rails (4.7.0.1) - railties (>= 3.2, < 5.1) + font-awesome-rails (4.7.0.2) + railties (>= 3.2, < 5.2) foreman (0.78.0) thor (~> 0.19.1) formatador (0.2.5) @@ -263,8 +259,8 @@ GEM rugged (~> 0.21) gemojione (3.3.0) json - get_process_mem (0.2.0) - gettext (3.2.2) + get_process_mem (0.2.1) + gettext (3.2.4) locale (>= 2.0.5) text (>= 1.3.0) gettext_i18n_rails (1.8.0) @@ -275,7 +271,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.33.0) + gitaly-proto (0.33.1) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -288,10 +284,10 @@ GEM flowdock (~> 0.7) gitlab-grit (>= 2.4.1) multi_json - gitlab-grit (2.8.1) + gitlab-grit (2.8.2) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) - mime-types (>= 1.16, < 3) + mime-types (>= 1.16) posix-spawn (~> 0.3) gitlab-markup (1.6.2) gitlab_omniauth-ldap (2.0.4) @@ -299,8 +295,8 @@ GEM omniauth (~> 1.3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - globalid (0.3.7) - activesupport (>= 4.1.0) + globalid (0.4.0) + activesupport (>= 4.2.0) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) gollum-lib (4.2.7) @@ -319,20 +315,18 @@ GEM json multi_json request_store (>= 1.0) - google-api-client (0.8.7) - activesupport (>= 3.2, < 5.0) - addressable (~> 2.3) - autoparse (~> 0.3) - extlib (~> 0.9) - faraday (~> 0.9) - googleauth (~> 0.3) - launchy (~> 2.4) - multi_json (~> 1.10) - retriable (~> 1.4) - signet (~> 0.6) - google-protobuf (3.4.0.2) - googleauth (0.5.1) - faraday (~> 0.9) + google-api-client (0.13.6) + addressable (~> 2.5, >= 2.5.1) + googleauth (~> 0.5) + httpclient (>= 2.8.1, < 3.0) + mime-types (~> 3.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) + google-protobuf (3.4.1.1) + googleapis-common-protos-types (1.0.0) + google-protobuf (~> 3.0) + googleauth (0.5.3) + faraday (~> 0.12) jwt (~> 1.4) logging (~> 2.0) memoist (~> 0.12) @@ -341,7 +335,7 @@ GEM signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) - grape (1.0.0) + grape (1.0.1) activesupport builder mustermann-grape (~> 1.0.0) @@ -357,8 +351,9 @@ GEM rake grape_logging (1.7.0) grape - grpc (1.6.0) + grpc (1.6.2) google-protobuf (~> 3.1) + googleapis-common-protos-types (~> 1.0.0) googleauth (~> 0.5.1) haml (4.0.7) tilt @@ -368,17 +363,17 @@ GEM rake (>= 10, < 13) rubocop (>= 0.49.0) sysexits (~> 1.1) - hamlit (2.6.1) + hamlit (2.6.2) temple (~> 0.7.6) thor tilt - hashdiff (0.3.4) + hashdiff (0.3.6) hashie (3.5.6) hashie-forbidden_attributes (0.1.1) hashie (>= 3.0) health_check (2.6.0) rails (>= 4.0) - hipchat (1.5.2) + hipchat (1.5.4) httparty mimemagic html-pipeline (1.11.0) @@ -394,19 +389,17 @@ GEM http_parser.rb (~> 0.6.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (1.0.1) + http-form_data (1.0.3) http_parser.rb (0.6.0) httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - httpclient (2.8.2) + httpclient (2.8.3) i18n (0.8.6) ice_nine (0.11.2) - influxdb (0.2.3) - cause - json + influxdb (0.4.1) ipaddress (0.8.3) - jira-ruby (1.4.1) + jira-ruby (1.4.3) activesupport multipart-post oauth (~> 0.5, >= 0.5.0) @@ -416,14 +409,14 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.6) - json-jwt (1.7.1) + json-jwt (1.7.2) activesupport bindata multi_json (>= 1.3) securecompare url_safe_base64 - json-schema (2.6.2) - addressable (~> 2.3.8) + json-schema (2.8.0) + addressable (>= 2.4) jwt (1.5.6) kaminari (1.0.1) activesupport (>= 4.1.0) @@ -437,8 +430,8 @@ GEM activerecord kaminari-core (= 1.0.1) kaminari-core (1.0.1) - kgio (2.10.0) - knapsack (1.11.0) + kgio (2.11.0) + knapsack (1.11.1) rake timecop (>= 0.1.0) kubeclient (2.2.0) @@ -449,11 +442,11 @@ GEM addressable (~> 2.3) letter_opener (1.4.1) launchy (~> 2.2) - letter_opener_web (1.3.0) + letter_opener_web (1.3.1) actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - license_finder (2.1.0) + license_finder (2.1.2) bundler httparty rubyzip @@ -466,40 +459,43 @@ GEM logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) - lograge (0.5.1) + lograge (0.7.1) actionpack (>= 4, < 5.2) activesupport (>= 4, < 5.2) railties (>= 4, < 5.2) + request_store (~> 1.0) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.6) mime-types (>= 1.16, < 4) mail_room (0.9.1) - memoist (0.15.0) + memoist (0.16.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.8.2) - mime-types (2.99.3) - mimemagic (0.3.0) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mimemagic (0.3.2) mini_mime (0.1.4) mini_portile2 (2.3.0) minitest (5.7.0) mmap2 (2.2.7) mousetrap-rails (1.4.6) - multi_json (1.12.1) + multi_json (1.12.2) multi_xml (0.6.0) multipart-post (2.0.0) - mustermann (1.0.0) + mustermann (1.0.1) mustermann-grape (1.0.0) mustermann (~> 1.0.0) - mysql2 (0.4.5) + mysql2 (0.4.9) net-ldap (0.16.0) net-ssh (4.1.0) netrc (0.11.0) nokogiri (1.8.1) mini_portile2 (~> 2.3.0) numerizer (0.1.1) - oauth (0.5.1) + oauth (0.5.3) oauth2 (1.4.0) faraday (>= 0.8, < 0.13) jwt (~> 1.0) @@ -512,14 +508,14 @@ GEM omniauth (1.4.2) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) - omniauth-auth0 (1.4.1) + omniauth-auth0 (1.4.2) omniauth-oauth2 (~> 1.1) omniauth-authentiq (0.3.1) omniauth-oauth2 (~> 1.3, >= 1.3.1) - omniauth-azure-oauth2 (0.0.6) + omniauth-azure-oauth2 (0.0.9) jwt (~> 1.0) omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) + omniauth-oauth2 (~> 1.4) omniauth-cas3 (1.1.4) addressable (~> 2.3) nokogiri (~> 1.7, >= 1.7.1) @@ -545,7 +541,7 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.3.1) + omniauth-oauth2 (1.4.0) oauth2 (~> 1.0) omniauth (~> 1.2) omniauth-oauth2-generic (0.2.2) @@ -571,7 +567,7 @@ GEM activerecord (>= 4.0, < 5.2) parser (2.4.0.0) ast (~> 2.2) - path_expander (1.0.1) + path_expander (1.0.2) peek (1.0.1) concurrent-ruby (>= 0.9.0) concurrent-ruby-ext (>= 0.9.0) @@ -612,9 +608,9 @@ GEM websocket-driver (>= 0.2.0) posix-spawn (0.3.13) powerpack (0.1.1) - premailer (1.10.4) + premailer (1.11.0) addressable - css_parser (>= 1.4.10) + css_parser (>= 1.6.0) htmlentities (>= 4.0.0) premailer-rails (1.9.7) actionmailer (>= 3, < 6) @@ -626,31 +622,31 @@ GEM procto (0.0.3) prometheus-client-mmap (0.7.0.beta14) mmap2 (~> 2.2, >= 2.2.7) - pry (0.10.4) + pry (0.11.0) coderay (~> 1.1.0) method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + pry-byebug (3.4.3) + byebug (>= 9.0, < 9.1) pry (~> 0.10) - pry-rails (0.3.5) - pry (>= 0.9.10) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.0) pyu-ruby-sasl (0.0.3.3) rack (1.6.8) rack-accept (0.4.5) rack (>= 0.4) rack-attack (4.4.1) rack - rack-cors (0.4.0) + rack-cors (0.4.1) rack-oauth2 (1.2.3) activesupport (>= 2.3) attr_required (>= 0.0.5) httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (1.5.3) + rack-protection (2.0.0) rack - rack-proxy (0.6.0) + rack-proxy (0.6.2) rack rack-test (0.6.3) rack (>= 1.0) @@ -683,18 +679,17 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake - raindrops (0.18.0) - rake (12.0.0) - rblineprof (0.3.6) + raindrops (0.19.0) + rake (12.1.0) + rblineprof (0.3.7) debugger-ruby_core_source (~> 1.3) rbnacl (4.0.2) ffi - rbnacl-libsodium (1.0.11) + rbnacl-libsodium (1.0.13) rbnacl (>= 3.0.1) - rdoc (4.2.2) - json (~> 1.4) + rdoc (4.3.0) re2 (1.1.1) - recaptcha (3.0.0) + recaptcha (3.4.0) json recursive-open-struct (1.0.0) redcarpet (3.4.0) @@ -703,33 +698,38 @@ GEM actionpack (>= 4.0, < 6) redis-rack (>= 1, < 3) redis-store (>= 1.1.0, < 1.4.0) - redis-activesupport (5.0.1) + redis-activesupport (5.0.3) activesupport (>= 3, < 6) - redis-store (~> 1.2.0) - redis-namespace (1.5.2) + redis-store (~> 1.3.0) + redis-namespace (1.5.3) redis (~> 3.0, >= 3.0.4) - redis-rack (1.6.0) - rack (~> 1.5) - redis-store (~> 1.2.0) - redis-rails (5.0.1) - redis-actionpack (~> 5.0.0) - redis-activesupport (~> 5.0.0) - redis-store (~> 1.2.0) - redis-store (1.2.0) + redis-rack (2.0.2) + rack (>= 1.5, < 3) + redis-store (>= 1.2, < 1.4) + redis-rails (5.0.2) + redis-actionpack (>= 5.0, < 6) + redis-activesupport (>= 5.0, < 6) + redis-store (>= 1.2, < 2) + redis-store (1.3.0) redis (>= 2.2) - request_store (1.3.1) - responders (2.3.0) - railties (>= 4.2.0, < 5.1) - rest-client (2.0.0) + representable (3.0.4) + declarative (< 0.1.0) + declarative-option (< 0.2.0) + uber (< 0.2.0) + request_store (1.3.2) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) + rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - retriable (1.4.1) - rinku (2.0.0) + retriable (3.1.1) + rinku (2.0.3) rotp (2.1.2) rouge (2.2.1) - rqrcode (0.7.0) - chunky_png + rqrcode (0.10.1) + chunky_png (~> 1.0) rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) rspec (3.6.0) @@ -750,7 +750,7 @@ GEM proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-rails (3.6.0) + rspec-rails (3.6.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -758,7 +758,7 @@ GEM rspec-expectations (~> 3.6.0) rspec-mocks (~> 3.6.0) rspec-support (~> 3.6.0) - rspec-retry (0.4.5) + rspec-retry (0.4.6) rspec-core rspec-set (0.1.3) rspec-support (3.6.0) @@ -781,21 +781,21 @@ GEM ruby-fogbugz (0.2.1) crack (~> 0.4) ruby-prof (0.16.2) - ruby-progressbar (1.8.1) - ruby-saml (1.4.1) + ruby-progressbar (1.8.3) + ruby-saml (1.5.0) nokogiri (>= 1.5.10) - ruby_parser (3.9.0) - sexp_processor (~> 4.1) + ruby_parser (3.10.1) + sexp_processor (~> 4.9) rubyntlm (0.6.2) - rubypants (0.2.0) + rubypants (0.6.0) rubyzip (1.2.1) - rufus-scheduler (3.4.0) + rufus-scheduler (3.4.2) et-orbi (~> 1.0) rugged (0.26.0) safe_yaml (1.0.4) sanitize (2.1.0) nokogiri (>= 1.4.4) - sass (3.4.22) + sass (3.4.25) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) @@ -812,12 +812,12 @@ GEM seed-fu (2.3.6) activerecord (>= 3.1) activesupport (>= 3.1) - select2-rails (3.5.9.3) + select2-rails (3.5.10) thor (~> 0.14) sentry-raven (2.5.3) faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) - sexp_processor (4.9.0) + sexp_processor (4.10.0) sham_rack (1.3.6) rack shoulda-matchers (3.1.2) @@ -827,7 +827,7 @@ GEM connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) redis (~> 3.3, >= 3.3.3) - sidekiq-cron (0.6.0) + sidekiq-cron (0.6.3) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) sidekiq-limit_fetch (3.4.0) @@ -837,15 +837,14 @@ GEM faraday (~> 0.9) jwt (~> 1.5) multi_json (~> 1.10) - simple_po_parser (1.1.2) + simple_po_parser (1.1.3) simplecov (0.14.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + simplecov-html (0.10.2) slack-notifier (1.5.1) - slop (3.6.0) - spinach (0.8.10) + spinach (0.10.0) colorize gherkin-ruby (>= 0.3.2) json @@ -855,7 +854,7 @@ GEM spinach (>= 0.4) spinach-rerun-reporter (0.0.2) spinach (~> 0.8) - spring (2.0.1) + spring (2.0.2) activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -864,21 +863,21 @@ GEM sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) stackprof (0.2.10) - state_machines (0.4.0) - state_machines-activemodel (0.4.0) - activemodel (>= 4.1, < 5.1) - state_machines (>= 0.4.0) - state_machines-activerecord (0.4.0) - activerecord (>= 4.1, < 5.1) + state_machines (0.5.0) + state_machines-activemodel (0.5.0) + activemodel (>= 4.1, < 5.2) + state_machines (>= 0.5.0) + state_machines-activerecord (0.4.1) + activerecord (>= 4.1, < 5.2) state_machines-activemodel (>= 0.3.0) stringex (2.7.1) - sys-filesystem (1.1.6) + sys-filesystem (1.1.8) ffi sysexits (1.2.0) temple (0.7.7) @@ -886,13 +885,13 @@ GEM test_after_commit (1.1.0) activerecord (>= 3.2) text (1.3.1) - thin (1.7.0) + thin (1.7.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.6) + tilt (2.0.8) timecop (0.8.1) timfel-krb5-auth (0.8.3) toml-rb (0.3.15) @@ -903,12 +902,13 @@ GEM tzinfo (1.2.3) thread_safe (~> 0.1) u2f (0.2.1) + uber (0.1.0) uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.2) + unf_ext (0.0.7.4) unicode-display_width (1.3.0) unicorn (5.1.0) kgio (~> 2.6) @@ -926,7 +926,7 @@ GEM parser (>= 2.3.1.2, < 2.5) procto (~> 0.0.2) url_safe_base64 (0.2.2) - validates_hostname (1.0.6) + validates_hostname (1.0.7) activerecord (>= 3.0) activesupport (>= 3.0) version_sorter (2.1.0) @@ -936,15 +936,15 @@ GEM descendants_tracker (~> 0.0, >= 0.0.3) equalizer (~> 0.0, >= 0.0.9) vmstat (2.3.0) - warden (1.2.6) + warden (1.2.7) rack (>= 1.0) webmock (2.3.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpack-rails (0.9.10) + webpack-rails (0.9.11) railties (>= 3.2.0) - websocket-driver (0.6.3) + websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) wikicloth (0.8.1) @@ -963,7 +963,7 @@ DEPENDENCIES ace-rails-ap (~> 4.1.0) activerecord_sane_schema_dumper (= 0.2) acts-as-taggable-on (~> 4.0) - addressable (~> 2.3.8) + addressable (~> 2.5.2) akismet (~> 2.0) allocations (~> 1.0) asana (~> 0.6.0) @@ -1033,7 +1033,7 @@ DEPENDENCIES gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) gon (~> 6.1.0) - google-api-client (~> 0.8.6) + google-api-client (~> 0.13.6) gpgme grape (~> 1.0) grape-entity (~> 0.6.0) @@ -1051,7 +1051,7 @@ DEPENDENCIES jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) jquery-rails (~> 4.1.0) - json-schema (~> 2.6.2) + json-schema (~> 2.8.0) jwt (~> 1.5.6) kaminari (~> 1.0) knapsack (~> 1.11.0) -- cgit v1.2.1 From 7feaad4c32dad9a1d49f5822d05f52c04a2cc552 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Tue, 26 Sep 2017 01:45:02 +0900 Subject: ok --- .../gem-sm-bump-google-api-client-gem-from-0-8-6-to-0-13-6.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/gem-sm-bump-google-api-client-gem-from-0-8-6-to-0-13-6.yml diff --git a/changelogs/unreleased/gem-sm-bump-google-api-client-gem-from-0-8-6-to-0-13-6.yml b/changelogs/unreleased/gem-sm-bump-google-api-client-gem-from-0-8-6-to-0-13-6.yml new file mode 100644 index 00000000000..13ec113167f --- /dev/null +++ b/changelogs/unreleased/gem-sm-bump-google-api-client-gem-from-0-8-6-to-0-13-6.yml @@ -0,0 +1,5 @@ +--- +title: Bump google-api-client Gem from 0.8.6 to 0.13.6 +merge_request: +author: +type: other -- cgit v1.2.1 From 028712fb843881f5c51d84e6b1edf77da2bc76ca Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Tue, 26 Sep 2017 09:12:36 +0000 Subject: Only update gems we need --- Gemfile.lock | 276 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 139 insertions(+), 137 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a741651f0a3..a13ab3e3305 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: RedCloth (4.3.2) abstract_type (0.0.7) - ace-rails-ap (4.1.3) + ace-rails-ap (4.1.2) actionmailer (4.2.8) actionpack (= 4.2.8) actionview (= 4.2.8) @@ -55,16 +55,17 @@ GEM faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.6.1) + asciidoctor (1.5.3) asciidoctor-plantuml (0.0.7) asciidoctor (~> 1.5) ast (2.3.0) atomic (1.1.99) attr_encrypted (3.0.3) encryptor (~> 3.0.0) - attr_required (1.0.1) - autoprefixer-rails (7.1.4.1) + attr_required (1.0.0) + autoprefixer-rails (6.2.3) execjs + json awesome_print (1.2.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -79,15 +80,15 @@ GEM coderay (>= 1.0.0) erubis (>= 2.6.6) rack (>= 0.9.0) - bindata (2.4.1) + bindata (2.3.5) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (3.3.7) + bootstrap-sass (3.3.6) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) bootstrap_form (2.7.0) - brakeman (3.6.2) - browser (2.5.1) + brakeman (3.6.1) + browser (2.2.0) builder (3.2.3) bullet (5.5.1) activesupport (>= 3.0.0) @@ -103,24 +104,25 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.17) + capybara-screenshot (1.0.14) capybara (>= 1.0, < 3) launchy carrierwave (1.1.0) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) + cause (0.1) charlock_holmes (0.7.5) chronic (0.10.2) chronic_duration (0.10.6) numerizer (~> 0.1.1) - chunky_png (1.3.8) + chunky_png (1.3.5) citrus (3.0.2) cliver (0.3.2) - coderay (1.1.2) + coderay (1.1.1) coercible (1.0.0) descendants_tracker (~> 0.0.1) - colorize (0.8.1) + colorize (0.7.7) concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) @@ -131,13 +133,13 @@ GEM crack (0.4.3) safe_yaml (~> 1.0.0) creole (0.5.0) - css_parser (1.6.0) + css_parser (1.5.0) addressable - d3_rails (3.5.17) + d3_rails (3.5.11) railties (>= 3.1.0) - daemons (1.2.4) + daemons (1.2.3) database_cleaner (1.5.3) - debug_inspector (0.0.3) + debug_inspector (0.0.2) debugger-ruby_core_source (1.3.8) deckar01-task_list (2.0.0) html-pipeline @@ -147,10 +149,10 @@ GEM activerecord (>= 3.2.0, < 5.1) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.3.0) + devise (4.2.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.2) + railties (>= 4.1.0, < 5.1) responders warden (~> 1.2.3) devise-two-factor (3.0.0) @@ -162,16 +164,16 @@ GEM diff-lcs (1.3) diffy (3.1.0) docile (1.1.5) - domain_name (0.5.20170404) + domain_name (0.5.20161021) unf (>= 0.0.5, < 1.0.0) - doorkeeper (4.2.6) + doorkeeper (4.2.0) railties (>= 4.2) doorkeeper-openid_connect (1.1.2) doorkeeper (~> 4.0) json-jwt (~> 1.6) - dropzonejs-rails (0.7.4) + dropzonejs-rails (0.7.2) rails (> 3.1) - email_reply_trimmer (0.1.8) + email_reply_trimmer (0.1.6) email_spec (1.6.0) launchy (~> 2.1) mail (~> 2.2) @@ -179,11 +181,11 @@ GEM equalizer (0.0.11) erubis (2.7.0) escape_utils (1.1.1) - et-orbi (1.0.5) + et-orbi (1.0.3) tzinfo - eventmachine (1.2.5) - excon (0.59.0) - execjs (2.7.0) + eventmachine (1.0.8) + excon (0.57.1) + execjs (2.6.0) expression_parser (0.9.0) factory_girl (4.7.0) activesupport (>= 3.0.0) @@ -192,13 +194,13 @@ GEM railties (>= 3.0.0) faraday (0.12.2) multipart-post (>= 1.2, < 3) - faraday_middleware (0.12.2) + faraday_middleware (0.11.0.1) faraday (>= 0.7.4, < 1.0) faraday_middleware-multi_json (0.0.6) faraday_middleware multi_json - fast_gettext (1.5.1) - ffaker (2.7.0) + fast_gettext (1.4.0) + ffaker (2.4.0) ffi (1.9.18) flay (2.8.1) erubis (~> 2.7.0) @@ -217,29 +219,29 @@ GEM fog-json (~> 1.0) ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (1.4.1) + fog-aws (1.4.0) fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.45.0) + fog-core (1.44.3) builder - excon (~> 0.58) + excon (~> 0.49) formatador (~> 0.2) - fog-google (0.5.5) + fog-google (0.5.3) fog-core fog-json fog-xml fog-json (1.0.2) fog-core (~> 1.0) multi_json (~> 1.10) - fog-local (0.4.0) + fog-local (0.3.1) fog-core (~> 1.27) fog-openstack (0.1.21) fog-core (>= 1.40) fog-json (>= 1.0) ipaddress (>= 0.8) - fog-rackspace (0.1.5) + fog-rackspace (0.1.1) fog-core (>= 1.35) fog-json (>= 1.0) fog-xml (>= 0.1) @@ -247,8 +249,8 @@ GEM fog-xml (0.1.3) fog-core nokogiri (>= 1.5.11, < 2.0.0) - font-awesome-rails (4.7.0.2) - railties (>= 3.2, < 5.2) + font-awesome-rails (4.7.0.1) + railties (>= 3.2, < 5.1) foreman (0.78.0) thor (~> 0.19.1) formatador (0.2.5) @@ -259,8 +261,8 @@ GEM rugged (~> 0.21) gemojione (3.3.0) json - get_process_mem (0.2.1) - gettext (3.2.4) + get_process_mem (0.2.0) + gettext (3.2.2) locale (>= 2.0.5) text (>= 1.3.0) gettext_i18n_rails (1.8.0) @@ -271,7 +273,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.33.1) + gitaly-proto (0.33.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -295,8 +297,8 @@ GEM omniauth (~> 1.3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - globalid (0.4.0) - activesupport (>= 4.2.0) + globalid (0.3.7) + activesupport (>= 4.1.0) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) gollum-lib (4.2.7) @@ -322,9 +324,7 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-protobuf (3.4.1.1) - googleapis-common-protos-types (1.0.0) - google-protobuf (~> 3.0) + google-protobuf (3.4.0.2) googleauth (0.5.3) faraday (~> 0.12) jwt (~> 1.4) @@ -335,7 +335,7 @@ GEM signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) - grape (1.0.1) + grape (1.0.0) activesupport builder mustermann-grape (~> 1.0.0) @@ -351,9 +351,8 @@ GEM rake grape_logging (1.7.0) grape - grpc (1.6.2) + grpc (1.6.0) google-protobuf (~> 3.1) - googleapis-common-protos-types (~> 1.0.0) googleauth (~> 0.5.1) haml (4.0.7) tilt @@ -363,17 +362,17 @@ GEM rake (>= 10, < 13) rubocop (>= 0.49.0) sysexits (~> 1.1) - hamlit (2.6.2) + hamlit (2.6.1) temple (~> 0.7.6) thor tilt - hashdiff (0.3.6) + hashdiff (0.3.4) hashie (3.5.6) hashie-forbidden_attributes (0.1.1) hashie (>= 3.0) health_check (2.6.0) rails (>= 4.0) - hipchat (1.5.4) + hipchat (1.5.2) httparty mimemagic html-pipeline (1.11.0) @@ -389,17 +388,19 @@ GEM http_parser.rb (~> 0.6.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (1.0.3) + http-form_data (1.0.1) http_parser.rb (0.6.0) httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - httpclient (2.8.3) + httpclient (2.8.2) i18n (0.8.6) ice_nine (0.11.2) - influxdb (0.4.1) + influxdb (0.2.3) + cause + json ipaddress (0.8.3) - jira-ruby (1.4.3) + jira-ruby (1.4.1) activesupport multipart-post oauth (~> 0.5, >= 0.5.0) @@ -409,7 +410,7 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.6) - json-jwt (1.7.2) + json-jwt (1.7.1) activesupport bindata multi_json (>= 1.3) @@ -430,8 +431,8 @@ GEM activerecord kaminari-core (= 1.0.1) kaminari-core (1.0.1) - kgio (2.11.0) - knapsack (1.11.1) + kgio (2.10.0) + knapsack (1.11.0) rake timecop (>= 0.1.0) kubeclient (2.2.0) @@ -442,11 +443,11 @@ GEM addressable (~> 2.3) letter_opener (1.4.1) launchy (~> 2.2) - letter_opener_web (1.3.1) + letter_opener_web (1.3.0) actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - license_finder (2.1.2) + license_finder (2.1.0) bundler httparty rubyzip @@ -459,11 +460,10 @@ GEM logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) - lograge (0.7.1) + lograge (0.5.1) actionpack (>= 4, < 5.2) activesupport (>= 4, < 5.2) railties (>= 4, < 5.2) - request_store (~> 1.0) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.6) @@ -476,7 +476,7 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mimemagic (0.3.2) + mimemagic (0.3.0) mini_mime (0.1.4) mini_portile2 (2.3.0) minitest (5.7.0) @@ -485,17 +485,17 @@ GEM multi_json (1.12.2) multi_xml (0.6.0) multipart-post (2.0.0) - mustermann (1.0.1) + mustermann (1.0.0) mustermann-grape (1.0.0) mustermann (~> 1.0.0) - mysql2 (0.4.9) + mysql2 (0.4.5) net-ldap (0.16.0) net-ssh (4.1.0) netrc (0.11.0) nokogiri (1.8.1) mini_portile2 (~> 2.3.0) numerizer (0.1.1) - oauth (0.5.3) + oauth (0.5.1) oauth2 (1.4.0) faraday (>= 0.8, < 0.13) jwt (~> 1.0) @@ -508,14 +508,14 @@ GEM omniauth (1.4.2) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) - omniauth-auth0 (1.4.2) + omniauth-auth0 (1.4.1) omniauth-oauth2 (~> 1.1) omniauth-authentiq (0.3.1) omniauth-oauth2 (~> 1.3, >= 1.3.1) - omniauth-azure-oauth2 (0.0.9) + omniauth-azure-oauth2 (0.0.6) jwt (~> 1.0) omniauth (~> 1.0) - omniauth-oauth2 (~> 1.4) + omniauth-oauth2 (~> 1.1) omniauth-cas3 (1.1.4) addressable (~> 2.3) nokogiri (~> 1.7, >= 1.7.1) @@ -541,7 +541,7 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.4.0) + omniauth-oauth2 (1.3.1) oauth2 (~> 1.0) omniauth (~> 1.2) omniauth-oauth2-generic (0.2.2) @@ -567,7 +567,7 @@ GEM activerecord (>= 4.0, < 5.2) parser (2.4.0.0) ast (~> 2.2) - path_expander (1.0.2) + path_expander (1.0.1) peek (1.0.1) concurrent-ruby (>= 0.9.0) concurrent-ruby-ext (>= 0.9.0) @@ -608,9 +608,9 @@ GEM websocket-driver (>= 0.2.0) posix-spawn (0.3.13) powerpack (0.1.1) - premailer (1.11.0) + premailer (1.10.4) addressable - css_parser (>= 1.6.0) + css_parser (>= 1.4.10) htmlentities (>= 4.0.0) premailer-rails (1.9.7) actionmailer (>= 3, < 6) @@ -622,14 +622,15 @@ GEM procto (0.0.3) prometheus-client-mmap (0.7.0.beta14) mmap2 (~> 2.2, >= 2.2.7) - pry (0.11.0) + pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) - pry-byebug (3.4.3) - byebug (>= 9.0, < 9.1) + slop (~> 3.4) + pry-byebug (3.4.2) + byebug (~> 9.0) pry (~> 0.10) - pry-rails (0.3.6) - pry (>= 0.10.4) + pry-rails (0.3.5) + pry (>= 0.9.10) public_suffix (3.0.0) pyu-ruby-sasl (0.0.3.3) rack (1.6.8) @@ -637,16 +638,16 @@ GEM rack (>= 0.4) rack-attack (4.4.1) rack - rack-cors (0.4.1) + rack-cors (0.4.0) rack-oauth2 (1.2.3) activesupport (>= 2.3) attr_required (>= 0.0.5) httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.0) + rack-protection (1.5.3) rack - rack-proxy (0.6.2) + rack-proxy (0.6.0) rack rack-test (0.6.3) rack (>= 1.0) @@ -679,17 +680,18 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake - raindrops (0.19.0) - rake (12.1.0) - rblineprof (0.3.7) + raindrops (0.18.0) + rake (12.0.0) + rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) rbnacl (4.0.2) ffi - rbnacl-libsodium (1.0.13) + rbnacl-libsodium (1.0.11) rbnacl (>= 3.0.1) - rdoc (4.3.0) + rdoc (4.2.2) + json (~> 1.4) re2 (1.1.1) - recaptcha (3.4.0) + recaptcha (3.0.0) json recursive-open-struct (1.0.0) redcarpet (3.4.0) @@ -698,38 +700,37 @@ GEM actionpack (>= 4.0, < 6) redis-rack (>= 1, < 3) redis-store (>= 1.1.0, < 1.4.0) - redis-activesupport (5.0.3) + redis-activesupport (5.0.1) activesupport (>= 3, < 6) - redis-store (~> 1.3.0) - redis-namespace (1.5.3) + redis-store (~> 1.2.0) + redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) - redis-rack (2.0.2) - rack (>= 1.5, < 3) - redis-store (>= 1.2, < 1.4) - redis-rails (5.0.2) - redis-actionpack (>= 5.0, < 6) - redis-activesupport (>= 5.0, < 6) - redis-store (>= 1.2, < 2) - redis-store (1.3.0) + redis-rack (1.6.0) + rack (~> 1.5) + redis-store (~> 1.2.0) + redis-rails (5.0.1) + redis-actionpack (~> 5.0.0) + redis-activesupport (~> 5.0.0) + redis-store (~> 1.2.0) + redis-store (1.2.0) redis (>= 2.2) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) uber (< 0.2.0) - request_store (1.3.2) - responders (2.4.0) - actionpack (>= 4.2.0, < 5.3) - railties (>= 4.2.0, < 5.3) - rest-client (2.0.2) + request_store (1.3.1) + responders (2.3.0) + railties (>= 4.2.0, < 5.1) + rest-client (2.0.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) retriable (3.1.1) - rinku (2.0.3) + rinku (2.0.0) rotp (2.1.2) rouge (2.2.1) - rqrcode (0.10.1) - chunky_png (~> 1.0) + rqrcode (0.7.0) + chunky_png rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) rspec (3.6.0) @@ -750,7 +751,7 @@ GEM proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-rails (3.6.1) + rspec-rails (3.6.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -758,7 +759,7 @@ GEM rspec-expectations (~> 3.6.0) rspec-mocks (~> 3.6.0) rspec-support (~> 3.6.0) - rspec-retry (0.4.6) + rspec-retry (0.4.5) rspec-core rspec-set (0.1.3) rspec-support (3.6.0) @@ -781,21 +782,21 @@ GEM ruby-fogbugz (0.2.1) crack (~> 0.4) ruby-prof (0.16.2) - ruby-progressbar (1.8.3) - ruby-saml (1.5.0) + ruby-progressbar (1.8.1) + ruby-saml (1.4.1) nokogiri (>= 1.5.10) - ruby_parser (3.10.1) - sexp_processor (~> 4.9) + ruby_parser (3.9.0) + sexp_processor (~> 4.1) rubyntlm (0.6.2) - rubypants (0.6.0) + rubypants (0.2.0) rubyzip (1.2.1) - rufus-scheduler (3.4.2) + rufus-scheduler (3.4.0) et-orbi (~> 1.0) rugged (0.26.0) safe_yaml (1.0.4) sanitize (2.1.0) nokogiri (>= 1.4.4) - sass (3.4.25) + sass (3.4.22) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) @@ -812,12 +813,12 @@ GEM seed-fu (2.3.6) activerecord (>= 3.1) activesupport (>= 3.1) - select2-rails (3.5.10) + select2-rails (3.5.9.3) thor (~> 0.14) sentry-raven (2.5.3) faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) - sexp_processor (4.10.0) + sexp_processor (4.9.0) sham_rack (1.3.6) rack shoulda-matchers (3.1.2) @@ -827,7 +828,7 @@ GEM connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) redis (~> 3.3, >= 3.3.3) - sidekiq-cron (0.6.3) + sidekiq-cron (0.6.0) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) sidekiq-limit_fetch (3.4.0) @@ -837,14 +838,15 @@ GEM faraday (~> 0.9) jwt (~> 1.5) multi_json (~> 1.10) - simple_po_parser (1.1.3) + simple_po_parser (1.1.2) simplecov (0.14.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) + simplecov-html (0.10.0) slack-notifier (1.5.1) - spinach (0.10.0) + slop (3.6.0) + spinach (0.8.10) colorize gherkin-ruby (>= 0.3.2) json @@ -854,7 +856,7 @@ GEM spinach (>= 0.4) spinach-rerun-reporter (0.0.2) spinach (~> 0.8) - spring (2.0.2) + spring (2.0.1) activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -863,21 +865,21 @@ GEM sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.1) + sprockets-rails (3.2.0) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) stackprof (0.2.10) - state_machines (0.5.0) - state_machines-activemodel (0.5.0) - activemodel (>= 4.1, < 5.2) - state_machines (>= 0.5.0) - state_machines-activerecord (0.4.1) - activerecord (>= 4.1, < 5.2) + state_machines (0.4.0) + state_machines-activemodel (0.4.0) + activemodel (>= 4.1, < 5.1) + state_machines (>= 0.4.0) + state_machines-activerecord (0.4.0) + activerecord (>= 4.1, < 5.1) state_machines-activemodel (>= 0.3.0) stringex (2.7.1) - sys-filesystem (1.1.8) + sys-filesystem (1.1.6) ffi sysexits (1.2.0) temple (0.7.7) @@ -885,13 +887,13 @@ GEM test_after_commit (1.1.0) activerecord (>= 3.2) text (1.3.1) - thin (1.7.2) + thin (1.7.0) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.8) + tilt (2.0.6) timecop (0.8.1) timfel-krb5-auth (0.8.3) toml-rb (0.3.15) @@ -908,7 +910,7 @@ GEM json (>= 1.8.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.4) + unf_ext (0.0.7.2) unicode-display_width (1.3.0) unicorn (5.1.0) kgio (~> 2.6) @@ -926,7 +928,7 @@ GEM parser (>= 2.3.1.2, < 2.5) procto (~> 0.0.2) url_safe_base64 (0.2.2) - validates_hostname (1.0.7) + validates_hostname (1.0.6) activerecord (>= 3.0) activesupport (>= 3.0) version_sorter (2.1.0) @@ -936,15 +938,15 @@ GEM descendants_tracker (~> 0.0, >= 0.0.3) equalizer (~> 0.0, >= 0.0.9) vmstat (2.3.0) - warden (1.2.7) + warden (1.2.6) rack (>= 1.0) webmock (2.3.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpack-rails (0.9.11) + webpack-rails (0.9.10) railties (>= 3.2.0) - websocket-driver (0.7.0) + websocket-driver (0.6.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) wikicloth (0.8.1) -- cgit v1.2.1 From 87328fa978ad9db14cd639f1ab636a0af82fa951 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Thu, 28 Sep 2017 21:49:37 +0800 Subject: Make sure we didn't blow up if URI is invalid --- lib/gitlab/url_sanitizer.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/gitlab/url_sanitizer.rb b/lib/gitlab/url_sanitizer.rb index 4e1ec1402ea..86a36ce93d3 100644 --- a/lib/gitlab/url_sanitizer.rb +++ b/lib/gitlab/url_sanitizer.rb @@ -64,6 +64,8 @@ module Gitlab url.password = password if password.present? url.user = user if user.present? url + rescue Addressable::URI::InvalidURIError + Addressable::URI.new end def generate_full_url -- cgit v1.2.1 From cffc28eca578a005a8e1256c2830c6e2bb9f2239 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Thu, 28 Sep 2017 22:03:20 +0800 Subject: Strip before passing to addressable, otherwise it's invalid --- lib/banzai/filter/sanitization_filter.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/banzai/filter/sanitization_filter.rb b/lib/banzai/filter/sanitization_filter.rb index 88b17e12576..d8c8deea628 100644 --- a/lib/banzai/filter/sanitization_filter.rb +++ b/lib/banzai/filter/sanitization_filter.rb @@ -73,8 +73,9 @@ module Banzai return unless node.has_attribute?('href') begin + node['href'] = node['href'].strip uri = Addressable::URI.parse(node['href']) - uri.scheme = uri.scheme.strip.downcase if uri.scheme + uri.scheme = uri.scheme.downcase if uri.scheme node.remove_attribute('href') if UNSAFE_PROTOCOLS.include?(uri.scheme) rescue Addressable::URI::InvalidURIError -- cgit v1.2.1 From f7fd36f2a264d4b4cbf9b308497b419aa7bd26c1 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Fri, 29 Sep 2017 20:42:27 +0800 Subject: Adapt to the latest addressable behaviour --- lib/gitlab/url_sanitizer.rb | 2 -- spec/lib/gitlab/url_sanitizer_spec.rb | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/gitlab/url_sanitizer.rb b/lib/gitlab/url_sanitizer.rb index 86a36ce93d3..4e1ec1402ea 100644 --- a/lib/gitlab/url_sanitizer.rb +++ b/lib/gitlab/url_sanitizer.rb @@ -64,8 +64,6 @@ module Gitlab url.password = password if password.present? url.user = user if user.present? url - rescue Addressable::URI::InvalidURIError - Addressable::URI.new end def generate_full_url diff --git a/spec/lib/gitlab/url_sanitizer_spec.rb b/spec/lib/gitlab/url_sanitizer_spec.rb index 59c28431e1e..6e31b6986a4 100644 --- a/spec/lib/gitlab/url_sanitizer_spec.rb +++ b/spec/lib/gitlab/url_sanitizer_spec.rb @@ -39,7 +39,8 @@ describe Gitlab::UrlSanitizer do false | nil false | '' false | '123://invalid:url' - true | 'valid@project:url.git' + false | 'valid@project:url.git' + true | 'valid:pass@project:url.git' true | 'ssh://example.com' true | 'ssh://:@example.com' true | 'ssh://foo@example.com' @@ -117,7 +118,6 @@ describe Gitlab::UrlSanitizer do 'http://example.com' | { user: nil, password: nil } # Credentials from SCP-style URLs are not supported at present - 'foo@example.com:path' | { user: nil, password: nil } 'foo:bar@example.com:path' | { user: nil, password: nil } # Other invalid URLs -- cgit v1.2.1 From 9401c137fdb6fd217cd81528c2d288f465262723 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Fri, 29 Sep 2017 21:45:00 +0800 Subject: Just allow the scheme we want! --- lib/gitlab/url_sanitizer.rb | 8 +++++--- spec/lib/gitlab/url_sanitizer_spec.rb | 5 +---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/gitlab/url_sanitizer.rb b/lib/gitlab/url_sanitizer.rb index 4e1ec1402ea..9931abe8a6e 100644 --- a/lib/gitlab/url_sanitizer.rb +++ b/lib/gitlab/url_sanitizer.rb @@ -1,7 +1,9 @@ module Gitlab class UrlSanitizer + ALLOWED_SCHEMES = %w[http https ssh git] + def self.sanitize(content) - regexp = URI::Parser.new.make_regexp(%w(http https ssh git)) + regexp = URI::Parser.new.make_regexp(ALLOWED_SCHEMES) content.gsub(regexp) { |url| new(url).masked_url } rescue Addressable::URI::InvalidURIError @@ -11,9 +13,9 @@ module Gitlab def self.valid?(url) return false unless url.present? - Addressable::URI.parse(url.strip) + uri = Addressable::URI.parse(url.strip) - true + ALLOWED_SCHEMES.include?(uri.scheme) rescue Addressable::URI::InvalidURIError false end diff --git a/spec/lib/gitlab/url_sanitizer_spec.rb b/spec/lib/gitlab/url_sanitizer_spec.rb index 6e31b6986a4..2f5cb92fb67 100644 --- a/spec/lib/gitlab/url_sanitizer_spec.rb +++ b/spec/lib/gitlab/url_sanitizer_spec.rb @@ -40,7 +40,7 @@ describe Gitlab::UrlSanitizer do false | '' false | '123://invalid:url' false | 'valid@project:url.git' - true | 'valid:pass@project:url.git' + false | 'valid:pass@project:url.git' true | 'ssh://example.com' true | 'ssh://:@example.com' true | 'ssh://foo@example.com' @@ -117,9 +117,6 @@ describe Gitlab::UrlSanitizer do 'http://@example.com' | { user: nil, password: nil } 'http://example.com' | { user: nil, password: nil } - # Credentials from SCP-style URLs are not supported at present - 'foo:bar@example.com:path' | { user: nil, password: nil } - # Other invalid URLs nil | { user: nil, password: nil } '' | { user: nil, password: nil } -- cgit v1.2.1 From e9ffa3395127618add901b9fc16117fb88c26b21 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Mon, 2 Oct 2017 14:45:58 +0800 Subject: Freeze the constant array --- lib/gitlab/url_sanitizer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/url_sanitizer.rb b/lib/gitlab/url_sanitizer.rb index 9931abe8a6e..1caa791c1be 100644 --- a/lib/gitlab/url_sanitizer.rb +++ b/lib/gitlab/url_sanitizer.rb @@ -1,6 +1,6 @@ module Gitlab class UrlSanitizer - ALLOWED_SCHEMES = %w[http https ssh git] + ALLOWED_SCHEMES = %w[http https ssh git].freeze def self.sanitize(content) regexp = URI::Parser.new.make_regexp(ALLOWED_SCHEMES) -- cgit v1.2.1 From 0a6925c1f5996115529582816415c99f4fb92ab1 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Tue, 3 Oct 2017 23:06:55 +0800 Subject: Remove those tests as they're not needed anymore Because now addressable would consider them invalid anyway. --- spec/lib/gitlab/url_sanitizer_spec.rb | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/spec/lib/gitlab/url_sanitizer_spec.rb b/spec/lib/gitlab/url_sanitizer_spec.rb index 2f5cb92fb67..fc8991fd31f 100644 --- a/spec/lib/gitlab/url_sanitizer_spec.rb +++ b/spec/lib/gitlab/url_sanitizer_spec.rb @@ -82,24 +82,6 @@ describe Gitlab::UrlSanitizer do describe '#credentials' do context 'credentials in hash' do - where(:input, :output) do - { user: 'foo', password: 'bar' } | { user: 'foo', password: 'bar' } - { user: 'foo', password: '' } | { user: 'foo', password: nil } - { user: 'foo', password: nil } | { user: 'foo', password: nil } - { user: '', password: 'bar' } | { user: nil, password: 'bar' } - { user: '', password: '' } | { user: nil, password: nil } - { user: '', password: nil } | { user: nil, password: nil } - { user: nil, password: 'bar' } | { user: nil, password: 'bar' } - { user: nil, password: '' } | { user: nil, password: nil } - { user: nil, password: nil } | { user: nil, password: nil } - end - - with_them do - subject { described_class.new('user@example.com:path.git', credentials: input).credentials } - - it { is_expected.to eq(output) } - end - it 'overrides URL-provided credentials' do sanitizer = described_class.new('http://a:b@example.com', credentials: { user: 'c', password: 'd' }) -- cgit v1.2.1