From e0b6c5bc1554e2fe119ad8498e11ce3fc6c0f7e7 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Sun, 23 Dec 2018 11:17:19 +0900 Subject: [PATCH 1/5] Bundle update with deleting faraday_middleware (v0.10) --- Gemfile | 8 ------- Gemfile.lock | 66 +++++++++++++++++++++++++--------------------------- 2 files changed, 32 insertions(+), 42 deletions(-) diff --git a/Gemfile b/Gemfile index ed1afca6c..cea9a4a6f 100644 --- a/Gemfile +++ b/Gemfile @@ -31,18 +31,10 @@ gem 'secure_headers' gem 'kramdown' gem 'faraday' -# TODO: Delete this if the following issue is fixed -# https://github.com/bundler/bundler/issues/5332 -gem 'faraday_middleware', '0.10' - gem 'koala' - gem 'rack-user_agent' - gem 'rack-attack' - gem 'google_drive' - gem 'lazy_high_charts' group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 7a2eeb540..f00aa3633 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,15 +41,15 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) arel (8.0.0) - autoprefixer-rails (9.4.2) + autoprefixer-rails (9.4.3) execjs backports (3.11.4) bindex (0.5.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootstrap-sass (3.3.7) + bootstrap-sass (3.4.0) autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) + sassc (>= 2.0.0) builder (3.2.3) byebug (10.0.2) capybara (3.12.0) @@ -70,7 +70,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.3) + concurrent-ruby (1.1.4) connection_pool (2.2.2) crass (1.0.4) debug_inspector (0.0.3) @@ -85,15 +85,15 @@ GEM multi_json (>= 1.0) multipart-post (>= 1.1.5) posix-spawn (>= 0.3.6) - erubi (1.7.1) + erubi (1.8.0) erubis (2.7.0) ethon (0.11.0) ffi (>= 1.3.0) execjs (2.7.0) - faraday (0.9.2) + faraday (0.15.4) multipart-post (>= 1.2, < 3) - faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) + faraday_middleware (0.12.2) + faraday (>= 0.7.4, < 1.0) ffi (1.9.25) flamegraph (0.9.5) font-awesome-rails (4.7.0.4) @@ -107,24 +107,24 @@ GEM net-http-pipeline globalid (0.4.1) activesupport (>= 4.2.0) - google-api-client (0.21.2) + google-api-client (0.25.0) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.5, < 0.7.0) httpclient (>= 2.8.1, < 3.0) mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google_drive (3.0.0) - google-api-client (>= 0.11.0, < 0.22.0) + signet (~> 0.10) + google_drive (3.0.1) + google-api-client (>= 0.11.0, < 0.26.0) googleauth (>= 0.5.0, < 1.0.0) nokogiri (>= 1.5.3, < 2.0.0) - googleauth (0.5.1) - faraday (~> 0.9) - jwt (~> 1.4) - logging (~> 2.0) - memoist (~> 0.12) + googleauth (0.6.7) + faraday (~> 0.12) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) multi_json (~> 1.11) - os (~> 0.9) + os (>= 0.9, < 2.0) signet (~> 0.7) haml (5.0.4) temple (>= 0.8.0) @@ -143,10 +143,10 @@ GEM nokogiri (>= 1.6.0) ruby_parser (~> 3.5) httpclient (2.8.3) - hyp_diff (0.0.5) - diff-lcs (~> 1.2, >= 1.2.5) - nokogiri (~> 1.6, >= 1.6.5) - i18n (1.1.1) + hyp_diff (0.0.6) + diff-lcs (>= 1.2, < 2.0) + nokogiri (>= 1.6, < 2.0) + i18n (1.3.0) concurrent-ruby (~> 1.0) jbuilder (2.8.0) activesupport (>= 4.2.0) @@ -158,7 +158,7 @@ GEM jquery-ui-rails (6.0.1) railties (>= 3.2.16) json (2.1.0) - jwt (1.5.6) + jwt (2.1.0) koala (3.0.0) addressable faraday @@ -172,10 +172,6 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - little-plugger (1.1.4) - logging (2.2.2) - little-plugger (~> 1.1) - multi_json (~> 1.10) loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -188,7 +184,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) minitest-retry (0.1.9) minitest (>= 5.0) @@ -198,9 +194,9 @@ GEM connection_pool (~> 2.2) net-http-pipeline (1.0.1) nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) - os (0.9.6) + nokogiri (1.9.1) + mini_portile2 (~> 2.4.0) + os (1.0.0) pg (1.1.3) posix-spawn (0.3.13) pry (0.12.2) @@ -226,7 +222,7 @@ GEM rack (>= 1.0, < 3) rack-host-redirect (1.3.0) rack - rack-mini-profiler (1.0.0) + rack-mini-profiler (1.0.1) rack (>= 1.2.0) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -262,8 +258,8 @@ GEM thor (>= 0.18.1, < 2.0) rake (12.3.2) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + rb-inotify (0.10.0) + ffi (~> 1.0) regexp_parser (1.3.0) representable (3.0.4) declarative (< 0.1.0) @@ -304,6 +300,9 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + sassc (2.0.0) + ffi (~> 1.9.6) + rake scrivito (1.13.0) scrivito_content_browser (= 1.13.0) scrivito_editors (= 1.13.0) @@ -402,7 +401,6 @@ DEPENDENCIES dotenv-rails dumper faraday - faraday_middleware (= 0.10) flamegraph font-awesome-rails google_drive From 31a6d02683d2190e86caeea5e8dbceda62795c90 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Sun, 23 Dec 2018 11:27:27 +0900 Subject: [PATCH 2/5] =?UTF-8?q?Remove=20needless=20whitespaces=20around=20?= =?UTF-8?q?'=E3=82=B3=E3=83=81=E3=83=A9'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/home/show.html.haml | 3 +-- app/views/shared/_newsletter.html+smartphone.haml | 3 ++- app/views/shared/_newsletter.html.haml | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/home/show.html.haml b/app/views/home/show.html.haml index 501214a35..dad56b590 100644 --- a/app/views/home/show.html.haml +++ b/app/views/home/show.html.haml @@ -126,8 +126,7 @@ %br %h2 ニュースレター購読 %br - %p - = render partial: 'shared/newsletter' + = render partial: 'shared/newsletter' .text-center %section.detail-introduction diff --git a/app/views/shared/_newsletter.html+smartphone.haml b/app/views/shared/_newsletter.html+smartphone.haml index eef181b16..1a8552b8b 100644 --- a/app/views/shared/_newsletter.html+smartphone.haml +++ b/app/views/shared/_newsletter.html+smartphone.haml @@ -2,7 +2,8 @@ CoderDojo コミュニティの最新情報をキャッチアップしてみませんか? CoderDojo Japan が最近の活動をメールで毎月配信しています。 過去の配信は - %a{:href => 'http://news.coderdojo.jp/', :target => '_blank'}コチラ + %a{:href => 'https://news.coderdojo.jp/', :target => '_blank'}<> + コチラ から ;) %form#mc-embedded-subscribe-form{:class=> "validate", :action =>"https://coderdojo.us17.list-manage.com/subscribe/post?u=39a5824e42ab56ec44bb4e84e&id=097dfa6a14", :method =>"post", :name =>"mc-embedded-subscribe-form" ,:novalidate=>"" ,:target=>"_blank"} diff --git a/app/views/shared/_newsletter.html.haml b/app/views/shared/_newsletter.html.haml index 57b54531b..7332bedbc 100644 --- a/app/views/shared/_newsletter.html.haml +++ b/app/views/shared/_newsletter.html.haml @@ -2,7 +2,8 @@ CoderDojo コミュニティの最新情報をキャッチアップしてみませんか? CoderDojo Japan が最近の活動をメールで毎月配信しています。 過去の配信は - %a{:href => 'http://news.coderdojo.jp/', :target => '_blank'}コチラ + %a{:href => 'https://news.coderdojo.jp/', :target => '_blank'}<> + コチラ から ;) %div#mc_embed_signup From 4f8ddb6b0506384365641e819a279f14d4a2fe49 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Sun, 23 Dec 2018 11:40:33 +0900 Subject: [PATCH 3/5] Upgrade Scrivito: 1.3.0 -> 1.4.0 --- Gemfile | 2 +- Gemfile.lock | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index cea9a4a6f..b5fb1ff10 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ gem 'rails', '5.1.6' gem 'pg' gem 'dumper' -gem 'scrivito', '~> 1.13.0' +gem 'scrivito', '~> 1.14.0' gem 'scrivito_section_widgets' gem 'scrivito_teaser_widget' diff --git a/Gemfile.lock b/Gemfile.lock index f00aa3633..4daa731c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -303,20 +303,20 @@ GEM sassc (2.0.0) ffi (~> 1.9.6) rake - scrivito (1.13.0) - scrivito_content_browser (= 1.13.0) - scrivito_editors (= 1.13.0) - scrivito_sdk (= 1.13.0) - scrivito_ui (= 1.13.0) - scrivito_content_browser (1.13.0) + scrivito (1.14.0) + scrivito_content_browser (= 1.14.0) + scrivito_editors (= 1.14.0) + scrivito_sdk (= 1.14.0) + scrivito_ui (= 1.14.0) + scrivito_content_browser (1.14.0) railties - scrivito_sdk (= 1.13.0) - scrivito_editors (1.13.0) + scrivito_sdk (= 1.14.0) + scrivito_editors (1.14.0) jquery-ui-rails (>= 5.0.0, < 7.0.0) railties - scrivito_content_browser (= 1.13.0) - scrivito_sdk (= 1.13.0) - scrivito_sdk (1.13.0) + scrivito_content_browser (= 1.14.0) + scrivito_sdk (= 1.14.0) + scrivito_sdk (1.14.0) addressable (~> 2.3) connection_pool (~> 2.2) diff-lcs (~> 1.2) @@ -334,7 +334,7 @@ GEM scrivito scrivito_teaser_widget (0.1.2) scrivito - scrivito_ui (1.13.0) + scrivito_ui (1.14.0) railties secure_headers (6.0.0) selenium-webdriver (3.141.0) @@ -429,7 +429,7 @@ DEPENDENCIES rspec-rails (~> 3.5) rspec-retry sass-rails - scrivito (~> 1.13.0) + scrivito (~> 1.14.0) scrivito_section_widgets scrivito_teaser_widget secure_headers From cd124821d33aa7776abcf1e0bbe8a379e6256158 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Sun, 23 Dec 2018 11:42:00 +0900 Subject: [PATCH 4/5] Upgrade Scrivito: 1.4.0 -> 1.5.0 --- Gemfile | 2 +- Gemfile.lock | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index b5fb1ff10..11c9d1166 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ gem 'rails', '5.1.6' gem 'pg' gem 'dumper' -gem 'scrivito', '~> 1.14.0' +gem 'scrivito', '~> 1.15.0' gem 'scrivito_section_widgets' gem 'scrivito_teaser_widget' diff --git a/Gemfile.lock b/Gemfile.lock index 4daa731c2..8b27a1ced 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -303,20 +303,20 @@ GEM sassc (2.0.0) ffi (~> 1.9.6) rake - scrivito (1.14.0) - scrivito_content_browser (= 1.14.0) - scrivito_editors (= 1.14.0) - scrivito_sdk (= 1.14.0) - scrivito_ui (= 1.14.0) - scrivito_content_browser (1.14.0) + scrivito (1.15.0) + scrivito_content_browser (= 1.15.0) + scrivito_editors (= 1.15.0) + scrivito_sdk (= 1.15.0) + scrivito_ui (= 1.15.0) + scrivito_content_browser (1.15.0) railties - scrivito_sdk (= 1.14.0) - scrivito_editors (1.14.0) + scrivito_sdk (= 1.15.0) + scrivito_editors (1.15.0) jquery-ui-rails (>= 5.0.0, < 7.0.0) railties - scrivito_content_browser (= 1.14.0) - scrivito_sdk (= 1.14.0) - scrivito_sdk (1.14.0) + scrivito_content_browser (= 1.15.0) + scrivito_sdk (= 1.15.0) + scrivito_sdk (1.15.0) addressable (~> 2.3) connection_pool (~> 2.2) diff-lcs (~> 1.2) @@ -334,7 +334,7 @@ GEM scrivito scrivito_teaser_widget (0.1.2) scrivito - scrivito_ui (1.14.0) + scrivito_ui (1.15.0) railties secure_headers (6.0.0) selenium-webdriver (3.141.0) @@ -429,7 +429,7 @@ DEPENDENCIES rspec-rails (~> 3.5) rspec-retry sass-rails - scrivito (~> 1.14.0) + scrivito (~> 1.15.0) scrivito_section_widgets scrivito_teaser_widget secure_headers From fd927978f4c477aaaf1e82b5af179b14c8991e7e Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Sun, 23 Dec 2018 12:13:34 +0900 Subject: [PATCH 5/5] Upgrade Rails: 5.1.6 -> 5.1.6.1 --- Gemfile | 2 +- Gemfile.lock | 66 ++++++++++++++++++++++++++-------------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Gemfile b/Gemfile index 11c9d1166..d66245e6f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' ruby '2.5.3' -gem 'rails', '5.1.6' +gem 'rails', '~> 5.1.6' gem 'pg' gem 'dumper' diff --git a/Gemfile.lock b/Gemfile.lock index 8b27a1ced..1f3829ff9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,39 +1,39 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.1.6) - actionpack (= 5.1.6) + actioncable (5.1.6.1) + actionpack (= 5.1.6.1) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.6) - actionpack (= 5.1.6) - actionview (= 5.1.6) - activejob (= 5.1.6) + actionmailer (5.1.6.1) + actionpack (= 5.1.6.1) + actionview (= 5.1.6.1) + activejob (= 5.1.6.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.6) - actionview (= 5.1.6) - activesupport (= 5.1.6) + actionpack (5.1.6.1) + actionview (= 5.1.6.1) + activesupport (= 5.1.6.1) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.6) - activesupport (= 5.1.6) + actionview (5.1.6.1) + activesupport (= 5.1.6.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.6) - activesupport (= 5.1.6) + activejob (5.1.6.1) + activesupport (= 5.1.6.1) globalid (>= 0.3.6) - activemodel (5.1.6) - activesupport (= 5.1.6) - activerecord (5.1.6) - activemodel (= 5.1.6) - activesupport (= 5.1.6) + activemodel (5.1.6.1) + activesupport (= 5.1.6.1) + activerecord (5.1.6.1) + activemodel (= 5.1.6.1) + activesupport (= 5.1.6.1) arel (~> 8.0) - activesupport (5.1.6) + activesupport (5.1.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -229,17 +229,17 @@ GEM rack-user_agent (0.5.2) rack (>= 1.5) woothee (>= 1.0.0) - rails (5.1.6) - actioncable (= 5.1.6) - actionmailer (= 5.1.6) - actionpack (= 5.1.6) - actionview (= 5.1.6) - activejob (= 5.1.6) - activemodel (= 5.1.6) - activerecord (= 5.1.6) - activesupport (= 5.1.6) + rails (5.1.6.1) + actioncable (= 5.1.6.1) + actionmailer (= 5.1.6.1) + actionpack (= 5.1.6.1) + actionview (= 5.1.6.1) + activejob (= 5.1.6.1) + activemodel (= 5.1.6.1) + activerecord (= 5.1.6.1) + activesupport (= 5.1.6.1) bundler (>= 1.3.0) - railties (= 5.1.6) + railties (= 5.1.6.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.4) actionpack (>= 5.0.1.x) @@ -250,9 +250,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - railties (5.1.6) - actionpack (= 5.1.6) - activesupport (= 5.1.6) + railties (5.1.6.1) + actionpack (= 5.1.6.1) + activesupport (= 5.1.6.1) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -422,7 +422,7 @@ DEPENDENCIES rack-host-redirect rack-mini-profiler rack-user_agent - rails (= 5.1.6) + rails (~> 5.1.6) rails-controller-testing rails-html-sanitizer (~> 1.0.4) rake