From 50b36ef59de4bac5375c68f41d49e16132eb1f86 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Tue, 23 Apr 2019 00:54:26 +0200 Subject: [PATCH 1/7] Fixed Healthchecks in docker-compose.yml (#10553) --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index faa066149b..47662d4707 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,7 +43,7 @@ services: - external_network - internal_network healthcheck: - test: ["CMD-SHELL", "wget -q --spider --header 'x-forwarded-proto: https' --proxy off localhost:3000/api/v1/instance || exit 1"] + test: ["CMD-SHELL", "wget -q --spider --header 'x-forwarded-proto: https' --proxy=off localhost:3000/api/v1/instance || exit 1"] ports: - "127.0.0.1:3000:3000" depends_on: @@ -63,7 +63,7 @@ services: - external_network - internal_network healthcheck: - test: ["CMD-SHELL", "wget -q --spider --header 'x-forwarded-proto: https' --proxy off localhost:4000/api/v1/streaming/health || exit 1"] + test: ["CMD-SHELL", "wget -q --spider --header 'x-forwarded-proto: https' --proxy=off localhost:4000/api/v1/streaming/health || exit 1"] ports: - "127.0.0.1:4000:4000" depends_on: From 703cdf2a0cfb283b9d96389e9f76f54c46f6b15d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 23 Apr 2019 00:54:51 +0200 Subject: [PATCH 2/7] Bump capybara from 3.16.2 to 3.17.0 (#10602) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.2 to 3.17.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.16.2...3.17.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 93e495de3b..005bdf4abf 100644 --- a/Gemfile +++ b/Gemfile @@ -107,7 +107,7 @@ group :production, :test do end group :test do - gem 'capybara', '~> 3.16' + gem 'capybara', '~> 3.17' gem 'climate_control', '~> 0.2' gem 'faker', '~> 1.9' gem 'microformats', '~> 4.1' diff --git a/Gemfile.lock b/Gemfile.lock index 80942a8db7..8d52a1b3cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -127,7 +127,7 @@ GEM sshkit (~> 1.3) capistrano-yarn (2.0.2) capistrano (~> 3.0) - capybara (3.16.2) + capybara (3.17.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -670,7 +670,7 @@ DEPENDENCIES capistrano-rails (~> 1.4) capistrano-rbenv (~> 2.1) capistrano-yarn (~> 2.0) - capybara (~> 3.16) + capybara (~> 3.17) charlock_holmes (~> 0.7.6) chewy (~> 5.0) cld3 (~> 3.2.4) From f99bfb9496482c7f3734789b3c16fc19e95e0c75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 23 Apr 2019 10:02:58 +0900 Subject: [PATCH 3/7] [Security] Bump nokogiri from 1.10.2 to 1.10.3 (#10620) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.2 to 1.10.3. **This update includes security fixes.** - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.2...v1.10.3) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8d52a1b3cf..3f87f3b6ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -355,7 +355,7 @@ GEM net-ssh (>= 2.6.5) net-ssh (5.0.2) nio4r (2.3.1) - nokogiri (1.10.2) + nokogiri (1.10.3) mini_portile2 (~> 2.4.0) nokogumbo (2.0.0) nokogiri (~> 1.8, >= 1.8.4) From 041fb0e840d85a6e9be2ff97fb80c3bf36f94644 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 23 Apr 2019 04:39:21 +0200 Subject: [PATCH 4/7] Fix sign up button not saying sign up when invite is used (#10623) Fix #10616 --- app/views/auth/registrations/new.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml index bd6e3a13f7..b4a7cced55 100644 --- a/app/views/auth/registrations/new.html.haml +++ b/app/views/auth/registrations/new.html.haml @@ -36,6 +36,6 @@ = f.input :agreement, as: :boolean, wrapper: :with_label, label: t('auth.checkbox_agreement_html', rules_path: about_more_path, terms_path: terms_path) .actions - = f.button :button, sign_up_message, type: :submit + = f.button :button, @invite.present? ? t('auth.register') : sign_up_message, type: :submit .form-footer= render 'auth/shared/links' From 8a0d677cde361b271b42c84056a80535f22549cc Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 23 Apr 2019 04:39:48 +0200 Subject: [PATCH 5/7] Fix stoplight logging to stderr separate from Rails logger (#10624) --- config/initializers/stoplight.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/initializers/stoplight.rb b/config/initializers/stoplight.rb index 1bd4ee6e7c..7384b2e9a6 100644 --- a/config/initializers/stoplight.rb +++ b/config/initializers/stoplight.rb @@ -1,3 +1,4 @@ require 'stoplight' Stoplight::Light.default_data_store = Stoplight::DataStore::Redis.new(Redis.current) +Stoplight::Light.default_notifiers = [Stoplight::Notifier::Logger.new(Rails.logger)] From db61383f82b6c75443c026c1aaf2b0d9be48766e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 23 Apr 2019 18:53:52 +0900 Subject: [PATCH 6/7] Bump capybara from 3.17.0 to 3.18.0 (#10626) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.17.0 to 3.18.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.17.0...3.18.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 005bdf4abf..6fe97412b8 100644 --- a/Gemfile +++ b/Gemfile @@ -107,7 +107,7 @@ group :production, :test do end group :test do - gem 'capybara', '~> 3.17' + gem 'capybara', '~> 3.18' gem 'climate_control', '~> 0.2' gem 'faker', '~> 1.9' gem 'microformats', '~> 4.1' diff --git a/Gemfile.lock b/Gemfile.lock index 3f87f3b6ec..49bddd3dcb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -127,7 +127,7 @@ GEM sshkit (~> 1.3) capistrano-yarn (2.0.2) capistrano (~> 3.0) - capybara (3.17.0) + capybara (3.18.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -670,7 +670,7 @@ DEPENDENCIES capistrano-rails (~> 1.4) capistrano-rbenv (~> 2.1) capistrano-yarn (~> 2.0) - capybara (~> 3.17) + capybara (~> 3.18) charlock_holmes (~> 0.7.6) chewy (~> 5.0) cld3 (~> 3.2.4) From 80bbf40ff1871b34bba4c0b133a573da459cf72e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 23 Apr 2019 16:39:06 +0200 Subject: [PATCH 7/7] Bump sidekiq from 5.2.6 to 5.2.7 (#10627) Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.6 to 5.2.7. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v5.2.6...v5.2.7) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 49bddd3dcb..da984ccae0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -552,7 +552,7 @@ GEM scss_lint (0.57.1) rake (>= 0.9, < 13) sass (~> 3.5, >= 3.5.5) - sidekiq (5.2.6) + sidekiq (5.2.7) connection_pool (~> 2.2, >= 2.2.2) rack (>= 1.5.0) rack-protection (>= 1.5.0)