From fb2a0843349cca7d47399436980d3d685b09c9c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 May 2021 01:52:16 +0000 Subject: [PATCH 01/11] Bump browserslist from 4.16.4 to 4.16.6 Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.16.4 to 4.16.6. - [Release notes](https://github.com/browserslist/browserslist/releases) - [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md) - [Commits](https://github.com/browserslist/browserslist/compare/4.16.4...4.16.6) Signed-off-by: dependabot[bot] --- package-lock.json | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index f293591f..98102824 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3805,15 +3805,27 @@ } }, "browserslist": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.4.tgz", - "integrity": "sha512-d7rCxYV8I9kj41RH8UKYnvDYCRENUlHRgyXy/Rhr/1BaeLGfiCptEdFE8MIrvGfWbBFNjVYx76SQWvNX1j+/cQ==", + "version": "4.16.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", + "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==", "requires": { - "caniuse-lite": "^1.0.30001208", + "caniuse-lite": "^1.0.30001219", "colorette": "^1.2.2", - "electron-to-chromium": "^1.3.712", + "electron-to-chromium": "^1.3.723", "escalade": "^3.1.1", "node-releases": "^1.1.71" + }, + "dependencies": { + "caniuse-lite": { + "version": "1.0.30001230", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz", + "integrity": "sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==" + }, + "electron-to-chromium": { + "version": "1.3.739", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.739.tgz", + "integrity": "sha512-+LPJVRsN7hGZ9EIUUiWCpO7l4E3qBYHNadazlucBfsXBbccDFNKUBAgzE68FnkWGJPwD/AfKhSzL+G+Iqb8A4A==" + } } }, "buffer": { @@ -5083,11 +5095,6 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", "dev": true }, - "electron-to-chromium": { - "version": "1.3.717", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.717.tgz", - "integrity": "sha512-OfzVPIqD1MkJ7fX+yTl2nKyOE4FReeVfMCzzxQS+Kp43hZYwHwThlGP+EGIZRXJsxCM7dqo8Y65NOX/HP12iXQ==" - }, "elliptic": { "version": "6.5.4", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", From 37b08daa0fc9704d59c02168872c888298ccaeb9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 May 2021 01:52:17 +0000 Subject: [PATCH 02/11] Bump dns-packet from 1.3.1 to 1.3.4 Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4. - [Release notes](https://github.com/mafintosh/dns-packet/releases) - [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md) - [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4) Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index f293591f..e122df11 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4987,9 +4987,9 @@ "dev": true }, "dns-packet": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz", - "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz", + "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==", "dev": true, "requires": { "ip": "^1.1.0", From ff6601b23d5f68e1d64576e6edcbbc288f674b3e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 May 2021 09:29:53 +0000 Subject: [PATCH 03/11] Bump slack-notifier from 2.3.2 to 2.4.0 Bumps [slack-notifier](https://github.com/stevenosloan/slack-notifier) from 2.3.2 to 2.4.0. - [Release notes](https://github.com/stevenosloan/slack-notifier/releases) - [Changelog](https://github.com/slack-notifier/slack-notifier/blob/main/changelog.md) - [Commits](https://github.com/stevenosloan/slack-notifier/compare/2.3.2...2.4.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 85f25e86..2a0b0074 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1488,7 +1488,7 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - slack-notifier (2.3.2) + slack-notifier (2.4.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) From e73798934e6c0facf9a9caa3f2395a5a1c56fc97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 May 2021 09:29:54 +0000 Subject: [PATCH 04/11] Bump mini_racer from 0.3.1 to 0.4.0 Bumps [mini_racer](https://github.com/discourse/mini_racer) from 0.3.1 to 0.4.0. - [Release notes](https://github.com/discourse/mini_racer/releases) - [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG) - [Commits](https://github.com/discourse/mini_racer/compare/v0.3.1...v0.4.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 85f25e86..e48523da 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1303,7 +1303,7 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_filter (0.3.01) - libv8 (8.4.255.0) + libv8-node (15.14.0.1) listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -1331,8 +1331,8 @@ GEM mini_magick (4.11.0) mini_mime (1.0.2) mini_portile2 (2.5.1) - mini_racer (0.3.1) - libv8 (~> 8.4.255) + mini_racer (0.4.0) + libv8-node (~> 15.14.0.0) minitest (5.14.4) mixpanel-ruby (2.2.2) multi_json (1.15.0) From 18d90be48bb45842df59a86859ad2e54232ef3aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 May 2021 09:29:57 +0000 Subject: [PATCH 05/11] Bump rack-mini-profiler from 2.3.1 to 2.3.2 Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 2.3.1 to 2.3.2. - [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases) - [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md) - [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v2.3.1...v2.3.2) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 85f25e86..1fed53a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1382,7 +1382,7 @@ GEM activesupport (>= 3.0.0) racc (1.5.2) rack (2.2.3) - rack-mini-profiler (2.3.1) + rack-mini-profiler (2.3.2) rack (>= 1.2.0) rack-pjax (1.1.0) nokogiri (~> 1.5) From 6623aa32e99007ed502dc97b94a61ab8bf33e355 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Jun 2021 05:04:30 +0000 Subject: [PATCH 06/11] Bump ibm_watson from 2.0.1 to 2.1.1 Bumps [ibm_watson](https://github.com/watson-developer-cloud/ruby-sdk) from 2.0.1 to 2.1.1. - [Release notes](https://github.com/watson-developer-cloud/ruby-sdk/releases) - [Changelog](https://github.com/watson-developer-cloud/ruby-sdk/blob/master/.releaserc) - [Commits](https://github.com/watson-developer-cloud/ruby-sdk/compare/v2.0.1...v2.1.1) --- updated-dependencies: - dependency-name: ibm_watson dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 85f25e86..035b08cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1226,10 +1226,13 @@ GEM multipart-post (>= 1.2, < 3) faraday_middleware (0.14.0) faraday (>= 0.7.4, < 1.0) - faye-websocket (0.11.0) + faye-websocket (0.11.1) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) ffi (1.15.0) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake filesize (0.2.0) flamegraph (0.9.5) flipper (0.20.4) @@ -1249,27 +1252,28 @@ GEM activesupport (>= 2) nokogiri (>= 1.4) htmlentities (4.3.4) - http (4.1.1) + http (4.4.1) addressable (~> 2.3) http-cookie (~> 1.0) - http-form_data (~> 2.0) - http_parser.rb (~> 0.6.0) + http-form_data (~> 2.2) + http-parser (~> 1.2.0) http-cookie (1.0.3) domain_name (~> 0.5) http-form_data (2.3.0) - http_parser.rb (0.6.0) + http-parser (1.2.3) + ffi-compiler (>= 1.0, < 2.0) i18n (1.8.10) concurrent-ruby (~> 1.0) - ibm_cloud_sdk_core (1.1.1) + ibm_cloud_sdk_core (1.1.3) concurrent-ruby (~> 1.0) - http (~> 4.1.0) + http (~> 4.4.0) jwt (~> 2.2.1) - ibm_watson (2.0.1) + ibm_watson (2.1.1) concurrent-ruby (~> 1.0) eventmachine (~> 1.2) faye-websocket (~> 0.11) - http (~> 4.1.0) - ibm_cloud_sdk_core (~> 1.1.1) + http (~> 4.4.0) + ibm_cloud_sdk_core (~> 1.1.3) jwt (~> 2.2.1) image_processing (1.12.1) mini_magick (>= 4.9.5, < 5) @@ -1285,7 +1289,7 @@ GEM jquery-ui-rails (6.0.1) railties (>= 3.2.16) json (2.3.0) - jwt (2.2.2) + jwt (2.2.3) kaminari (1.2.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.1) @@ -1538,7 +1542,7 @@ GEM rack-proxy (>= 0.6.1) railties (>= 5.2) semantic_range (>= 2.3.0) - websocket-driver (0.7.3) + websocket-driver (0.7.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) zeitwerk (2.4.2) From d778aa608ce777e979145c09c3952f70927d8142 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 6 Jun 2021 17:50:18 +0000 Subject: [PATCH 07/11] Bump ws from 6.2.1 to 6.2.2 Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/commits) --- updated-dependencies: - dependency-name: ws dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index c763fb96..098c2978 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11644,9 +11644,9 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "ws": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", - "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz", + "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==", "dev": true, "requires": { "async-limiter": "~1.0.0" From 9d62b47fc880e3d18a07f7811a7cc7c354f9d1cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 16:20:41 +0000 Subject: [PATCH 08/11] Bump postcss from 7.0.35 to 7.0.36 Bumps [postcss](https://github.com/postcss/postcss) from 7.0.35 to 7.0.36. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/7.0.35...7.0.36) --- updated-dependencies: - dependency-name: postcss dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index c763fb96..282b7350 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8160,9 +8160,9 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "requires": { "chalk": "^2.4.2", "source-map": "^0.6.1", @@ -9792,16 +9792,6 @@ "domutils": "^2.0.0", "entities": "^2.0.0" } - }, - "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - } } } }, From 5486858919f9a146fc0ef128258975a5088bad07 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Fri, 18 Jun 2021 00:38:36 -0700 Subject: [PATCH 09/11] Default new universes to current universe scope --- app/controllers/timelines_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/timelines_controller.rb b/app/controllers/timelines_controller.rb index 257d4053..7107a124 100644 --- a/app/controllers/timelines_controller.rb +++ b/app/controllers/timelines_controller.rb @@ -39,7 +39,7 @@ class TimelinesController < ApplicationController # GET /timelines/new def new - timeline = current_user.timelines.create(name: 'Untitled Timeline').reload + timeline = current_user.timelines.create(name: 'Untitled Timeline', universe: @universe_scope).reload redirect_to edit_timeline_path(timeline) end From d37d4338140e51b5251188c1c38a387d09ea9f33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Jun 2021 07:41:17 +0000 Subject: [PATCH 10/11] Bump acts_as_list from 1.0.3 to 1.0.4 Bumps [acts_as_list](https://github.com/brendon/acts_as_list) from 1.0.3 to 1.0.4. - [Release notes](https://github.com/brendon/acts_as_list/releases) - [Changelog](https://github.com/brendon/acts_as_list/blob/master/CHANGELOG.md) - [Commits](https://github.com/brendon/acts_as_list/compare/v1.0.3...v1.0.4) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 035b08cd..474edc4e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -104,7 +104,7 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - acts_as_list (1.0.3) + acts_as_list (1.0.4) activerecord (>= 4.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) @@ -1192,7 +1192,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) connection_pool (2.2.3) crass (1.0.6) csv (3.1.9) From a982958152e03f97437bf2843a8db7c91f930978 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Fri, 18 Jun 2021 00:47:21 -0700 Subject: [PATCH 11/11] don't error when stripe can't detect card brand --- app/views/subscriptions/history.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/subscriptions/history.html.erb b/app/views/subscriptions/history.html.erb index 269f2c58..b7729db3 100644 --- a/app/views/subscriptions/history.html.erb +++ b/app/views/subscriptions/history.html.erb @@ -26,7 +26,7 @@ <% else %>

We have a payment method on file for you through Stripe - (<%= @stripe_customer.sources.data[0].brand %> ending in <%= @stripe_customer.sources.data[0].last4 %>), + (<%= @stripe_customer.sources.data[0].try(:brand) || 'a card' %> ending in <%= @stripe_customer.sources.data[0].last4 %>), but since we don't store it, you cannot edit it. You can choose to add a new one (replacing the old), or delete the existing one.