From 5de592bccec2df4fc8d3575d20ec935c62018840 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 29 Oct 2018 12:54:56 +0100 Subject: Bump doorkeeper from 5.0.1 to 5.0.2 (#9134) Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.0.1 to 5.0.2. - [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases) - [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md) - [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.1...v5.0.2) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 166dfdb4f..53f92495e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -199,7 +199,7 @@ GEM docile (1.3.0) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.0.1) + doorkeeper (5.0.2) railties (>= 4.2) dotenv (2.5.0) dotenv-rails (2.5.0) -- cgit From 3b89abc343f6e351f25ece882905683bb975e2a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 29 Oct 2018 12:55:16 +0100 Subject: Bump rubocop from 0.59.2 to 0.60.0 (#9135) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.59.2 to 0.60.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.59.2...v0.60.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile b/Gemfile index ca2d2d51a..d956a3149 100644 --- a/Gemfile +++ b/Gemfile @@ -126,7 +126,7 @@ group :development do gem 'letter_opener', '~> 1.4' gem 'letter_opener_web', '~> 1.3' gem 'memory_profiler' - gem 'rubocop', '~> 0.59', require: false + gem 'rubocop', '~> 0.60', require: false gem 'brakeman', '~> 4.3', require: false gem 'bundler-audit', '~> 0.6', require: false gem 'scss_lint', '~> 0.57', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 53f92495e..8549f5cc3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -528,15 +528,15 @@ GEM rspec-core (~> 3.0, >= 3.0.0) sidekiq (>= 2.4.0) rspec-support (3.8.0) - rubocop (0.59.2) + rubocop (0.60.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) powerpack (~> 0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.9.0) + unicode-display_width (~> 1.4.0) + ruby-progressbar (1.10.0) ruby-saml (1.9.0) nokogiri (>= 1.5.10) rufus-scheduler (3.5.2) @@ -747,7 +747,7 @@ DEPENDENCIES rqrcode (~> 0.10) rspec-rails (~> 3.8) rspec-sidekiq (~> 3.0) - rubocop (~> 0.59) + rubocop (~> 0.60) sanitize (~> 4.6) scss_lint (~> 0.57) sidekiq (~> 5.2) -- cgit From 8c944c2f631de7d24ac236fdc9a6cc19314bf178 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 29 Oct 2018 12:55:34 +0100 Subject: Bump tzinfo-data from 1.2018.6 to 1.2018.7 (#9136) Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2018.6 to 1.2018.7. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.6...v1.2018.7) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 8549f5cc3..2c9e996bb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -625,7 +625,7 @@ GEM unf (~> 0.1.0) tzinfo (1.2.5) thread_safe (~> 0.1) - tzinfo-data (1.2018.6) + tzinfo-data (1.2018.7) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext -- cgit From ce33ce94c94f038f4d632ffadd21666df51315f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 29 Oct 2018 12:55:55 +0100 Subject: Bump parallel_tests from 2.25.0 to 2.26.0 (#9137) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.25.0 to 2.26.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.25.0...v2.26.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile b/Gemfile index d956a3149..113b40d85 100644 --- a/Gemfile +++ b/Gemfile @@ -114,7 +114,7 @@ group :test do gem 'rspec-sidekiq', '~> 3.0' gem 'simplecov', '~> 0.16', require: false gem 'webmock', '~> 3.4' - gem 'parallel_tests', '~> 2.25' + gem 'parallel_tests', '~> 2.26' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 2c9e996bb..bb90b73ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -393,7 +393,7 @@ GEM av (~> 0.9.0) paperclip (>= 2.5.2) parallel (1.12.1) - parallel_tests (2.25.0) + parallel_tests (2.26.0) parallel parser (2.5.1.2) ast (~> 2.4.0) @@ -723,7 +723,7 @@ DEPENDENCIES ox (~> 2.10) paperclip (~> 6.0) paperclip-av-transcoder (~> 0.6) - parallel_tests (~> 2.25) + parallel_tests (~> 2.26) pg (~> 1.1) pghero (~> 2.2) pkg-config (~> 1.3) -- cgit From 32f950a7a8d3acfed43d76cb21d0fc06a471bafe Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 29 Oct 2018 13:46:39 +0100 Subject: Update i18n-tasks to master (#9139) --- Gemfile | 2 +- Gemfile.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile b/Gemfile index 113b40d85..452daab9e 100644 --- a/Gemfile +++ b/Gemfile @@ -95,7 +95,7 @@ gem 'rdf-normalize', '~> 0.3' group :development, :test do gem 'fabrication', '~> 2.20' gem 'fuubar', '~> 2.3' - gem 'i18n-tasks', '~> 0.9', require: false, git: 'https://github.com/Gargron/i18n-tasks.git', ref: 'ab6e10878ccdb6243f934f30372276d260c14251' + gem 'i18n-tasks', '~> 0.9', require: false, git: 'https://github.com/glebm/i18n-tasks.git', branch: 'master', ref: 'a1c9089b4ffed4f33e3b3a1bb2378d7a23445c0f' gem 'pry-byebug', '~> 3.6' gem 'pry-rails', '~> 0.3' gem 'rspec-rails', '~> 3.8' diff --git a/Gemfile.lock b/Gemfile.lock index bb90b73ec..b5432bb01 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,8 @@ GIT - remote: https://github.com/Gargron/i18n-tasks.git - revision: ab6e10878ccdb6243f934f30372276d260c14251 - ref: ab6e10878ccdb6243f934f30372276d260c14251 + remote: https://github.com/glebm/i18n-tasks.git + revision: a1c9089b4ffed4f33e3b3a1bb2378d7a23445c0f + ref: a1c9089b4ffed4f33e3b3a1bb2378d7a23445c0f + branch: master specs: i18n-tasks (0.9.27) activesupport (>= 4.0.2) -- cgit From b40ea6d1d44a5f43ecf81e0690a79a7eff34204b Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 29 Oct 2018 14:05:25 +0100 Subject: Bump sanitize from 4.6.6 to 5.0.0 (#9140) --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ spec/lib/formatter_spec.rb | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile b/Gemfile index 452daab9e..3ffb0140f 100644 --- a/Gemfile +++ b/Gemfile @@ -72,7 +72,7 @@ gem 'rails-settings-cached', '~> 0.6' gem 'redis', '~> 4.0', require: ['redis', 'redis/connection/hiredis'] gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock' gem 'rqrcode', '~> 0.10' -gem 'sanitize', '~> 4.6' +gem 'sanitize', '~> 5.0' gem 'sidekiq', '~> 5.2' gem 'sidekiq-scheduler', '~> 3.0' gem 'sidekiq-unique-jobs', '~> 5.0' diff --git a/Gemfile.lock b/Gemfile.lock index b5432bb01..b0efd1bfb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -360,8 +360,8 @@ GEM nio4r (2.3.1) nokogiri (1.8.5) mini_portile2 (~> 2.3.0) - nokogumbo (1.5.0) - nokogiri + nokogumbo (2.0.0) + nokogiri (~> 1.8, >= 1.8.4) nsa (0.2.4) activesupport (>= 4.2, < 6) concurrent-ruby (~> 1.0.0) @@ -543,10 +543,10 @@ GEM rufus-scheduler (3.5.2) fugit (~> 1.1, >= 1.1.5) safe_yaml (1.0.4) - sanitize (4.6.6) + sanitize (5.0.0) crass (~> 1.0.2) - nokogiri (>= 1.4.4) - nokogumbo (~> 1.4) + nokogiri (>= 1.8.0) + nokogumbo (~> 2.0) sass (3.6.0) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -749,7 +749,7 @@ DEPENDENCIES rspec-rails (~> 3.8) rspec-sidekiq (~> 3.0) rubocop (~> 0.60) - sanitize (~> 4.6) + sanitize (~> 5.0) scss_lint (~> 0.57) sidekiq (~> 5.2) sidekiq-bulk (~> 0.1.1) diff --git a/spec/lib/formatter_spec.rb b/spec/lib/formatter_spec.rb index ec4a6493d..0c1efe7c3 100644 --- a/spec/lib/formatter_spec.rb +++ b/spec/lib/formatter_spec.rb @@ -514,7 +514,7 @@ RSpec.describe Formatter do subject { Formatter.instance.sanitize(html, Sanitize::Config::MASTODON_STRICT) } it 'sanitizes' do - is_expected.to eq 'alert("Hello")' + is_expected.to eq '' end end end -- cgit