mastodon

mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00

Author	SHA1	Message	Date
dependabot[bot]	fd01196fce	Bump ox from 2.14.1 to 2.14.2 (#15854 ) Bumps [ox](https://github.com/ohler55/ox) from 2.14.1 to 2.14.2. - [Release notes](https://github.com/ohler55/ox/releases) - [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/ox/compare/v2.14.1...v2.14.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-03-08 22:50:51 +09:00
dependabot[bot]	7d8f33b572	Bump parallel_tests from 3.5.0 to 3.5.1 (#15853 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 3.5.0 to 3.5.1. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md) - [Commits](https://github.com/grosser/parallel_tests/compare/v3.5.0...v3.5.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-03-08 22:50:39 +09:00
dependabot[bot]	0c33444986	Bump webmock from 3.12.0 to 3.12.1 (#15851 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.12.0 to 3.12.1. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.12.0...v3.12.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-03-08 22:50:13 +09:00
dependabot[bot]	454d036b74	Bump redcarpet from 3.5.0 to 3.5.1 Bumps [redcarpet](https://github.com/vmg/redcarpet) from 3.5.0 to 3.5.1. - [Release notes](https://github.com/vmg/redcarpet/releases) - [Changelog](https://github.com/vmg/redcarpet/blob/master/CHANGELOG.md) - [Commits](https://github.com/vmg/redcarpet/compare/v3.5.0...v3.5.1) Signed-off-by: dependabot[bot] <support@github.com>	2021-03-06 14:51:45 +01:00
dependabot[bot]	c3786b29b7	Bump puma from 5.2.1 to 5.2.2 (#15836 ) Bumps [puma](https://github.com/puma/puma) from 5.2.1 to 5.2.2. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.2.1...v5.2.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-03-05 12:32:37 +09:00
dependabot[bot]	a6b127eac7	Bump i18n-tasks from 0.9.33 to 0.9.34 (#15834 ) Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.33 to 0.9.34. - [Release notes](https://github.com/glebm/i18n-tasks/releases) - [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md) - [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.33...v0.9.34) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-03-05 12:00:23 +09:00
dependabot[bot]	c27d320296	Bump parallel_tests from 3.4.0 to 3.5.0 (#15813 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md) - [Commits](https://github.com/grosser/parallel_tests/compare/v3.4.0...v3.5.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-03-05 06:39:46 +09:00
dependabot[bot]	27d3fc99a9	Bump capistrano from 3.15.0 to 3.16.0 (#15818 ) * Bump capistrano from 3.15.0 to 3.16.0 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.15.0 to 3.16.0. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.15.0...v3.16.0) Signed-off-by: dependabot[bot] <support@github.com> * 3.16 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2021-03-05 06:38:52 +09:00
Claire	d8fdbb054e	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.	2021-03-02 12:06:58 +01:00
Claire	65db262550	Update twitter-text from 1.14 to 3.1.0 and fix toot character counting (#15382 ) * Update twitter-text from 1.14 to 3.1.0 * Disable emoji parsing * Properly depend on twitter-text for url detection * Fix some URLs being wrongly detected client-side * Add test for server-side validation of non-autolinkable URLs * Fix server-side status length counting	2021-03-02 12:02:56 +01:00
dependabot[bot]	287aa75f2e	Bump json-ld from 3.1.8 to 3.1.9 (#15812 ) Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.8 to 3.1.9. - [Release notes](https://github.com/ruby-rdf/json-ld/releases) - [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.8...3.1.9) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-03-01 23:50:00 +09:00
dependabot[bot]	8f5022e687	Bump fastimage from 2.2.2 to 2.2.3 (#15819 ) Bumps [fastimage](https://github.com/sdsykes/fastimage) from 2.2.2 to 2.2.3. - [Release notes](https://github.com/sdsykes/fastimage/releases) - [Commits](https://github.com/sdsykes/fastimage/compare/v2.2.2...v2.2.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-03-01 23:37:06 +09:00
dependabot[bot]	9ff5338508	Bump webmock from 3.11.2 to 3.12.0 (#15817 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.11.2 to 3.12.0. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.11.2...v3.12.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-03-01 23:36:45 +09:00
dependabot[bot]	a65ff30b2a	Bump aws-sdk-s3 from 1.88.1 to 1.89.0 (#15814 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.88.1 to 1.89.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-03-01 23:35:00 +09:00
dependabot[bot]	7f9bb105b7	Bump bullet from 6.1.3 to 6.1.4 (#15815 ) Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.3 to 6.1.4. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/6.1.3...6.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-03-01 23:34:29 +09:00
dependabot[bot]	eb83ab45e2	Bump doorkeeper from 5.4.0 to 5.5.0 (#15757 ) Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.4.0 to 5.5.0. - [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases) - [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/main/CHANGELOG.md) - [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.4.0...v5.5.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-02-24 06:58:39 +09:00
Claire	679642e26c	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-22 15:23:46 +01:00
dependabot[bot]	dcc7c686f3	Bump rails from 5.2.4.4 to 5.2.4.5 (#15729 ) Bumps [rails](https://github.com/rails/rails) from 5.2.4.4 to 5.2.4.5. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.4.4...v5.2.4.5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-02-20 21:38:05 +09:00
dependabot[bot]	68d1a4ee0c	Bump puma from 5.1.1 to 5.2.1 (#15670 ) Bumps [puma](https://github.com/puma/puma) from 5.1.1 to 5.2.1. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.1.1...v5.2.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-02-20 15:55:12 +09:00
dependabot[bot]	fd2cd8c278	Bump simple_form from 5.0.3 to 5.1.0 (#15732 ) Bumps [simple_form](https://github.com/plataformatec/simple_form) from 5.0.3 to 5.1.0. - [Release notes](https://github.com/plataformatec/simple_form/releases) - [Changelog](https://github.com/heartcombo/simple_form/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/simple_form/compare/v5.0.3...v5.1.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-02-19 18:09:30 +09:00
dependabot[bot]	ffc5398f91	Bump faker from 2.15.1 to 2.16.0 (#15735 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.15.1 to 2.16.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.15.1...v2.16.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-02-19 18:08:09 +09:00
dependabot[bot]	455447ef7c	Bump aws-sdk-s3 from 1.88.0 to 1.88.1 (#15730 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.88.0 to 1.88.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-02-19 18:07:40 +09:00
Claire	5e11f3a6e1	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.	2021-02-12 10:28:32 +01:00
Claire	21fb3f3684	Drop dependency on secure_headers, fix response headers (#15712 ) * Drop dependency on secure_headers, use always_write_cookie instead * Fix cookies in Tor Hidden Services by moving configuration to application.rb * Instead of setting always_write_cookie at boot, monkey-patch ActionDispatch	2021-02-11 23:47:05 +01:00
Claire	01e44b886d	Downgrade bootsnap to 1.6.0 (#15711 ) * Revert "Bump bootsnap from 1.5.1 to 1.7.1 (#15669)" This reverts commit `c3d1b7a2f5`. * Downgrade bootsnap to 1.6.0	2021-02-11 19:20:58 +01:00
dependabot[bot]	3fcc6b9aff	Bump rubocop from 1.8.1 to 1.9.1 (#15677 ) * Bump rubocop from 1.8.1 to 1.9.1 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 1.8.1 to 1.9.1. - [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/v1.8.1...v1.9.1) Signed-off-by: dependabot[bot] <support@github.com> * Fix .codeclimate.yml Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2021-02-12 00:10:00 +09:00
dependabot[bot]	69c1889a6a	Bump rack-attack from 6.4.0 to 6.5.0 (#15671 ) Bumps [rack-attack](https://github.com/rack/rack-attack) from 6.4.0 to 6.5.0. - [Release notes](https://github.com/rack/rack-attack/releases) - [Changelog](https://github.com/rack/rack-attack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack-attack/compare/v6.4.0...v6.5.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-02-11 20:58:46 +09:00
dependabot[bot]	5dd76ca30e	Bump redis-namespace from 1.8.0 to 1.8.1 (#15676 ) Bumps [redis-namespace](https://github.com/resque/redis-namespace) from 1.8.0 to 1.8.1. - [Release notes](https://github.com/resque/redis-namespace/releases) - [Changelog](https://github.com/resque/redis-namespace/blob/master/CHANGELOG.md) - [Commits](https://github.com/resque/redis-namespace/compare/v1.8.0...v1.8.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-02-11 20:54:19 +09:00
dependabot[bot]	404fd8918c	Bump json-ld from 3.1.7 to 3.1.8 (#15674 ) Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.7 to 3.1.8. - [Release notes](https://github.com/ruby-rdf/json-ld/releases) - [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.7...3.1.8) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-02-11 20:53:53 +09:00
dependabot[bot]	7ec3a9a735	Bump pkg-config from 1.4.4 to 1.4.5 (#15672 ) Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config) from 1.4.4 to 1.4.5. - [Release notes](https://github.com/ruby-gnome/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.4.4...1.4.5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-02-11 20:53:02 +09:00
dependabot[bot]	c3d1b7a2f5	Bump bootsnap from 1.5.1 to 1.7.1 (#15669 ) Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.5.1 to 1.7.1. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.5.1...v1.7.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-02-11 20:51:09 +09:00
Cecylia Bocovich	e79f8dd85c	Onion service related changes to HTTPS handling (#15560 ) * Enable secure cookie flag for https only * Disable force_ssl for .onion hosts only Co-authored-by: Aiden McClelland <me@drbonez.dev>	2021-02-11 04:40:13 +01:00
dependabot[bot]	9962d5c237	Bump pghero from 2.7.3 to 2.7.4 (#15668 ) Bumps [pghero](https://github.com/ankane/pghero) from 2.7.3 to 2.7.4. - [Release notes](https://github.com/ankane/pghero/releases) - [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/pghero/compare/v2.7.3...v2.7.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-02-10 09:56:11 +09:00
dependabot[bot]	0a630a1bc3	Bump aws-sdk-s3 from 1.87.0 to 1.88.0 (#15667 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.87.0 to 1.88.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-02-10 09:55:51 +09:00
Claire	4d40685850	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-03 17:02:48 +01:00
dependabot[bot]	1d96bf9f43	Bump oj from 3.11.1 to 3.11.2 (#15657 ) Bumps [oj](https://github.com/ohler55/oj) from 3.11.1 to 3.11.2. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.11.1...v3.11.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-02-03 04:27:57 +09:00
dependabot[bot]	b8aed2d255	Bump fastimage from 2.2.1 to 2.2.2 (#15651 ) Bumps [fastimage](https://github.com/sdsykes/fastimage) from 2.2.1 to 2.2.2. - [Release notes](https://github.com/sdsykes/fastimage/releases) - [Commits](https://github.com/sdsykes/fastimage/compare/v2.2.1...v2.2.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-02-03 04:27:19 +09:00
dependabot[bot]	2620e2cfa3	Bump webmock from 3.11.1 to 3.11.2 (#15650 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.11.1 to 3.11.2. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.11.1...v3.11.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-02-02 23:56:17 +09:00
dependabot[bot]	b109df0e2c	Bump capybara from 3.34.0 to 3.35.3 (#15649 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.34.0 to 3.35.3. - [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.34.0...3.35.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-02-02 23:47:35 +09:00
dependabot[bot]	ab39d5fda5	Bump chewy from 5.1.0 to 5.2.0 (#15648 ) Bumps [chewy](https://github.com/toptal/chewy) from 5.1.0 to 5.2.0. - [Release notes](https://github.com/toptal/chewy/releases) - [Changelog](https://github.com/toptal/chewy/blob/master/CHANGELOG.md) - [Commits](https://github.com/toptal/chewy/compare/v5.1.0...v5.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-02-02 23:47:12 +09:00
dependabot[bot]	eb0f9e3159	Bump rubocop from 1.7.0 to 1.8.1 (#15573 ) * Bump rubocop from 1.7.0 to 1.8.1 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 1.7.0 to 1.8.1. - [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/v1.7.0...v1.8.1) Signed-off-by: dependabot[bot] <support@github.com> * Fix .codeclimate.yml Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2021-02-01 03:48:29 +09:00
dependabot[bot]	38f5631588	Bump sidekiq from 6.1.2 to 6.1.3 (#15621 ) Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.1.2 to 6.1.3. - [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/v6.1.2...v6.1.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-27 08:58:29 +09:00
dependabot[bot]	e9ac263229	Bump thor from 1.0.1 to 1.1.0 (#15622 ) Bumps [thor](https://github.com/erikhuda/thor) from 1.0.1 to 1.1.0. - [Release notes](https://github.com/erikhuda/thor/releases) - [Changelog](https://github.com/erikhuda/thor/blob/master/CHANGELOG.md) - [Commits](https://github.com/erikhuda/thor/compare/v1.0.1...v1.1.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-26 23:35:03 +09:00
dependabot[bot]	70128820dc	Bump tzinfo-data from 1.2020.6 to 1.2021.1 (#15623 ) Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2020.6 to 1.2021.1. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2020.6...v1.2021.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-26 23:34:48 +09:00
dependabot[bot]	97e075f197	Bump oj from 3.11.0 to 3.11.1 (#15626 ) Bumps [oj](https://github.com/ohler55/oj) from 3.11.0 to 3.11.1. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.11.0...v3.11.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-26 23:33:46 +09:00
dependabot[bot]	3a3990a81d	Bump rack-attack from 6.3.1 to 6.4.0 (#15628 ) Bumps [rack-attack](https://github.com/rack/rack-attack) from 6.3.1 to 6.4.0. - [Release notes](https://github.com/rack/rack-attack/releases) - [Changelog](https://github.com/rack/rack-attack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack-attack/compare/v6.3.1...v6.4.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-26 23:33:06 +09:00
dependabot[bot]	14530a2323	Bump bullet from 6.1.2 to 6.1.3 (#15629 ) Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.2 to 6.1.3. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/6.1.2...6.1.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-26 23:32:42 +09:00
Claire	b81710c02c	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `CONTRIBUTING.md`: Not a real conflict, glitch-soc quotes the upstream file, which has been changed. Update the quote.	2021-01-26 14:01:30 +01:00
dependabot[bot]	3ca089d4d7	Bump makara from 0.4.1 to 0.5.0 (#15578 ) Bumps [makara](https://github.com/taskrabbit/makara) from 0.4.1 to 0.5.0. - [Release notes](https://github.com/taskrabbit/makara/releases) - [Changelog](https://github.com/instacart/makara/blob/master/CHANGELOG.md) - [Commits](https://github.com/taskrabbit/makara/compare/v0.4.1...v0.5.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-23 23:25:08 +09:00
Claire	f90fa11db5	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-21 16:51:12 +01:00
dependabot[bot]	71a019d632	Bump concurrent-ruby from 1.1.7 to 1.1.8 (#15601 ) Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.1.7 to 1.1.8. - [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases) - [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.7...v1.1.8) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-21 21:46:37 +09:00
dependabot[bot]	d8d75cd6c2	Bump sanitize from 5.2.2 to 5.2.3 (#15582 ) Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.2.2 to 5.2.3. - [Release notes](https://github.com/rgrove/sanitize/releases) - [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md) - [Commits](https://github.com/rgrove/sanitize/compare/v5.2.2...v5.2.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-20 21:42:34 +09:00
dependabot[bot]	77368d8ff9	Bump strong_migrations from 0.7.4 to 0.7.6 (#15581 ) Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.7.4 to 0.7.6. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.7.4...v0.7.6) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-20 21:40:39 +09:00
dependabot[bot]	c0499c1fcb	Bump oj from 3.10.18 to 3.11.0 (#15583 ) Bumps [oj](https://github.com/ohler55/oj) from 3.10.18 to 3.11.0. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.10.18...v3.11.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-20 21:30:56 +09:00
dependabot[bot]	266a95ee8f	Bump ox from 2.14.0 to 2.14.1 (#15576 ) Bumps [ox](https://github.com/ohler55/ox) from 2.14.0 to 2.14.1. - [Release notes](https://github.com/ohler55/ox/releases) - [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/ox/compare/v2.14.0...v2.14.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-20 21:29:29 +09:00
dependabot[bot]	8c6a3c18ff	Bump webmock from 3.11.0 to 3.11.1 (#15570 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.11.0 to 3.11.1. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.11.0...v3.11.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-20 21:17:59 +09:00
Claire	e202314a75	Merge branch 'master' into glitch-soc/merge-upstream	2021-01-18 13:57:12 +01:00
dependabot[bot]	e46b50e805	Bump capistrano from 3.14.1 to 3.15.0 (#15537 ) * Bump capistrano from 3.14.1 to 3.15.0 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.14.1 to 3.15.0. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.14.1...v3.15.0) Signed-off-by: dependabot[bot] <support@github.com> * Fix config/deploy.rb Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2021-01-18 11:10:23 +09:00
dependabot[bot]	1118194f29	Bump simplecov from 0.21.0 to 0.21.2 (#15536 ) Bumps [simplecov](https://github.com/simplecov-ruby/simplecov) from 0.21.0 to 0.21.2. - [Release notes](https://github.com/simplecov-ruby/simplecov/releases) - [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md) - [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.21.0...v0.21.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-17 01:06:28 +09:00
dependabot[bot]	4812c16cb5	Bump sanitize from 5.2.1 to 5.2.2 (#15538 ) Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.2.1 to 5.2.2. - [Release notes](https://github.com/rgrove/sanitize/releases) - [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md) - [Commits](https://github.com/rgrove/sanitize/compare/v5.2.1...v5.2.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-17 01:02:51 +09:00
dependabot[bot]	fe6ee39168	Bump nokogiri from 1.11.0 to 1.11.1 (#15539 ) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.0 to 1.11.1. - [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.11.0...v1.11.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-17 00:59:43 +09:00
Claire	33d30632fb	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/models/public_feed.rb`: Upstream refactored a bit, glitch-soc had specific code for local-only statuses. Updated glitch-soc's specific code accordingly.	2021-01-11 11:55:42 +01:00
dependabot[bot]	32df8950ae	Bump binding_of_caller from 0.8.0 to 1.0.0 (#15489 ) Bumps [binding_of_caller](https://github.com/banister/binding_of_caller) from 0.8.0 to 1.0.0. - [Release notes](https://github.com/banister/binding_of_caller/releases) - [Commits](https://github.com/banister/binding_of_caller/compare/v0.8.0...v1.0.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-07 14:10:49 +09:00
Claire	90528f43bc	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream.	2021-01-06 18:08:06 +01:00
dependabot[bot]	15be57059d	Bump nokogiri from 1.10.10 to 1.11.0 (#15487 ) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.10 to 1.11.0. - [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.10...v1.11.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-05 20:01:31 +01:00
dependabot[bot]	c747883dc8	Bump ruby-progressbar from 1.10.1 to 1.11.0 (#15491 ) Bumps [ruby-progressbar](https://github.com/jfelchner/ruby-progressbar) from 1.10.1 to 1.11.0. - [Release notes](https://github.com/jfelchner/ruby-progressbar/releases) - [Changelog](https://github.com/jfelchner/ruby-progressbar/blob/master/CHANGELOG.md) - [Commits](https://github.com/jfelchner/ruby-progressbar/compare/releases/v1.10.1...releases/v1.11.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-05 02:10:33 +09:00
dependabot[bot]	77611aad83	Bump simplecov from 0.20.0 to 0.21.0 (#15485 ) Bumps [simplecov](https://github.com/simplecov-ruby/simplecov) from 0.20.0 to 0.21.0. - [Release notes](https://github.com/simplecov-ruby/simplecov/releases) - [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md) - [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.20.0...v0.21.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-05 02:10:10 +09:00
dependabot[bot]	e1fe8b8b69	Bump fuubar from 2.5.0 to 2.5.1 (#15488 ) Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.5.0 to 2.5.1. - [Release notes](https://github.com/thekompanee/fuubar/releases) - [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md) - [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.5.0...releases/2.5.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-05 02:09:39 +09:00
dependabot[bot]	592f999d4f	Bump tzinfo-data from 1.2020.5 to 1.2020.6 (#15479 ) Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2020.5 to 1.2020.6. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2020.5...v1.2020.6) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-05 02:09:14 +09:00
dependabot[bot]	b5bd67a477	Bump i18n-tasks from 0.9.31 to 0.9.33 (#15445 ) Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.31 to 0.9.33. - [Release notes](https://github.com/glebm/i18n-tasks/releases) - [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md) - [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.31...v0.9.33) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-30 20:14:00 +09:00
dependabot[bot]	b9ad289502	Bump memory_profiler from 0.9.14 to 1.0.0 (#15289 ) Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler) from 0.9.14 to 1.0.0. - [Release notes](https://github.com/SamSaffron/memory_profiler/releases) - [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md) - [Commits](https://github.com/SamSaffron/memory_profiler/compare/v0.9.14...v1.0.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-30 20:05:32 +09:00
dependabot[bot]	ccd7bc6da7	Bump cld3 from 3.3.0 to 3.4.1 (#15391 ) Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.3.0 to 3.4.1. - [Release notes](https://github.com/akihikodaki/cld3-ruby/releases) - [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.3.0...v3.4.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-30 12:39:38 +09:00
dependabot[bot]	5a5b89397e	Bump webmock from 3.10.0 to 3.11.0 (#15388 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.10.0 to 3.11.0. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.10.0...v3.11.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-30 12:17:56 +09:00
dependabot[bot]	000947250a	Bump strong_migrations from 0.7.2 to 0.7.4 (#15389 ) Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.7.2 to 0.7.4. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.7.2...v0.7.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-30 12:17:39 +09:00
dependabot[bot]	7b7b102a63	Bump rubocop-rails from 2.8.1 to 2.9.1 (#15390 ) Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.8.1 to 2.9.1. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.8.1...v2.9.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-30 12:17:11 +09:00
dependabot[bot]	102e68218d	Bump rspec-rails from 4.0.1 to 4.0.2 (#15442 ) Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v4.0.1...v4.0.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-30 12:13:29 +09:00
dependabot[bot]	68c9f8d9a3	Bump brakeman from 4.10.0 to 4.10.1 (#15444 ) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.10.0 to 4.10.1. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v4.10.0...v4.10.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-30 12:08:12 +09:00
dependabot[bot]	a4be95e48f	Bump tzinfo-data from 1.2020.4 to 1.2020.5 (#15448 ) Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2020.4 to 1.2020.5. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2020.4...v1.2020.5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-30 11:52:41 +09:00
dependabot[bot]	fac50ac0d5	Bump fastimage from 2.2.0 to 2.2.1 (#15449 ) Bumps [fastimage](https://github.com/sdsykes/fastimage) from 2.2.0 to 2.2.1. - [Release notes](https://github.com/sdsykes/fastimage/releases) - [Commits](https://github.com/sdsykes/fastimage/compare/v2.2.0...v2.2.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-30 00:56:17 +09:00
dependabot[bot]	b379349053	Bump capybara from 3.33.0 to 3.34.0 (#15245 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.33.0 to 3.34.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.33.0...3.34.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-30 00:13:48 +09:00
dependabot[bot]	8e59e26e2b	Bump rubocop from 1.3.1 to 1.7.0 (#15447 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 1.3.1 to 1.7.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/v1.3.1...v1.7.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-30 00:12:03 +09:00
dependabot[bot]	6b74380917	Bump rqrcode from 1.1.2 to 1.2.0 (#15450 ) Bumps [rqrcode](https://github.com/whomwah/rqrcode) from 1.1.2 to 1.2.0. - [Release notes](https://github.com/whomwah/rqrcode/releases) - [Commits](https://github.com/whomwah/rqrcode/commits/v1.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-30 00:11:30 +09:00
dependabot[bot]	e329ddc580	Bump aws-sdk-s3 from 1.85.0 to 1.87.0 (#15446 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.85.0 to 1.87.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-30 00:09:11 +09:00
dependabot[bot]	bccd0fdd17	Bump oj from 3.10.16 to 3.10.18 (#15443 ) Bumps [oj](https://github.com/ohler55/oj) from 3.10.16 to 3.10.18. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.10.16...v3.10.18) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-30 00:08:40 +09:00
dependabot[bot]	26d63df65c	Bump tty-prompt from 0.22.0 to 0.23.0 (#15400 ) Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.22.0 to 0.23.0. - [Release notes](https://github.com/piotrmurach/tty-prompt/releases) - [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md) - [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.22.0...v0.23.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-30 00:08:23 +09:00
dependabot[bot]	b1e4f7b89f	Bump ox from 2.13.4 to 2.14.0 (#15396 ) Bumps [ox](https://github.com/ohler55/ox) from 2.13.4 to 2.14.0. - [Release notes](https://github.com/ohler55/ox/releases) - [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/ox/compare/v2.13.4...v2.14.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-30 00:08:06 +09:00
dependabot[bot]	954a77ed86	Bump json-ld-preloaded from 3.1.3 to 3.1.4 (#15453 ) Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases) - [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.3...3.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-30 00:06:48 +09:00
dependabot[bot]	7cf1bdcf2c	Bump bullet from 6.1.0 to 6.1.2 (#15344 ) Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.0 to 6.1.2. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/6.1.0...6.1.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-30 00:01:58 +09:00
dependabot[bot]	5c46bd4845	Bump puma from 5.0.4 to 5.1.1 (#15339 ) Bumps [puma](https://github.com/puma/puma) from 5.0.4 to 5.1.1. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.0.4...v5.1.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-29 23:55:32 +09:00
dependabot[bot]	aee44f4328	Bump json-ld from 3.1.5 to 3.1.7 (#15454 ) Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.5 to 3.1.7. - [Release notes](https://github.com/ruby-rdf/json-ld/releases) - [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.5...3.1.7) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-29 23:53:55 +09:00
dependabot[bot]	96941cf8ac	Bump active_model_serializers from 0.10.10 to 0.10.12 (#15329 ) Bumps [active_model_serializers](https://github.com/rails-api/active_model_serializers) from 0.10.10 to 0.10.12. - [Release notes](https://github.com/rails-api/active_model_serializers/releases) - [Changelog](https://github.com/rails-api/active_model_serializers/blob/v0.10.12/CHANGELOG.md) - [Commits](https://github.com/rails-api/active_model_serializers/compare/v0.10.10...v0.10.12) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-29 23:45:23 +09:00
dependabot[bot]	df30ae1d1c	Bump simplecov from 0.19.1 to 0.20.0 (#15244 ) Bumps [simplecov](https://github.com/simplecov-ruby/simplecov) from 0.19.1 to 0.20.0. - [Release notes](https://github.com/simplecov-ruby/simplecov/releases) - [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md) - [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.19.1...v0.20.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-29 23:40:35 +09:00
dependabot[bot]	87b97ab048	Bump pghero from 2.7.2 to 2.7.3 (#15250 ) Bumps [pghero](https://github.com/ankane/pghero) from 2.7.2 to 2.7.3. - [Release notes](https://github.com/ankane/pghero/releases) - [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/pghero/compare/v2.7.2...v2.7.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-29 23:40:12 +09:00
dependabot[bot]	20789e7e60	Bump net-ldap from 0.16.3 to 0.17.0 (#15242 ) Bumps [net-ldap](https://github.com/ruby-ldap/ruby-net-ldap) from 0.16.3 to 0.17.0. - [Release notes](https://github.com/ruby-ldap/ruby-net-ldap/releases) - [Changelog](https://github.com/ruby-ldap/ruby-net-ldap/blob/master/History.rdoc) - [Commits](https://github.com/ruby-ldap/ruby-net-ldap/compare/v0.16.3...v0.17.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-29 23:32:37 +09:00
dependabot[bot]	3cc9789eb2	Bump faker from 2.14.0 to 2.15.1 (#15239 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.14.0 to 2.15.1. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.14.0...v2.15.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-12-29 23:28:58 +09:00
Claire	e4f8679eae	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.	2020-12-15 14:27:06 +01:00
Eugen Rochko	216b85b053	Fix performance on instances list in admin UI (#15282 ) - Reduce duplicate queries - Remove n+1 queries - Add accounts count to detailed view - Add separate action log entry for updating existing domain blocks	2020-12-14 09:06:34 +01:00
Claire	f8d867bac4	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/services/remove_status_service.rb`: Conflict caused by us having a distinc Direct timeline. Ported upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict between glitch-soc's variable character limit and upstream refactoring that part of the code. Ported upstream changes.	2020-12-05 17:33:37 +01:00
ThibG	4b7f21a28e	Fix Gemfile.lock breaking CI (#15257 ) Unnecessary Ruby and Bundler version constraints got included in #15230	2020-12-01 12:34:33 +01:00
Eugen Rochko	8e0b98556f	Bump version to 3.3.0rc1 (#15230 )	2020-12-01 06:38:05 +01:00
Eugen Rochko	13b07b88f1	Fix omniauth (SAML/CAS) sign-in routes not having CSRF protection (#15228 )	2020-11-28 05:17:53 +01:00
Thibaut Girka	e71b16ae2b	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: glitch-soc-only dependency textually too close to updated upstream dependencies. Updated to upsteam dependencies.	2020-11-25 15:31:45 +01:00
dependabot[bot]	6b6b1ea2fb	Bump parallel from 1.20.0 to 1.20.1 (#15204 ) Bumps [parallel](https://github.com/grosser/parallel) from 1.20.0 to 1.20.1. - [Release notes](https://github.com/grosser/parallel/releases) - [Commits](https://github.com/grosser/parallel/compare/v1.20.0...v1.20.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-23 21:02:47 +09:00
dependabot[bot]	005354b98e	Bump parallel_tests from 3.3.0 to 3.4.0 (#15203 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 3.3.0 to 3.4.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md) - [Commits](https://github.com/grosser/parallel_tests/compare/v3.3.0...v3.4.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-23 17:02:30 +09:00
dependabot[bot]	af607c6528	Bump redis from 4.2.2 to 4.2.5 (#15202 ) Bumps [redis](https://github.com/redis/redis-rb) from 4.2.2 to 4.2.5. - [Release notes](https://github.com/redis/redis-rb/releases) - [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/redis-rb/compare/v4.2.2...v4.2.5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-23 17:00:55 +09:00
dependabot[bot]	9536ce1454	Bump rubocop from 1.3.0 to 1.3.1 (#15212 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 1.3.0 to 1.3.1. - [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/v1.3.0...v1.3.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-23 17:00:23 +09:00
dependabot[bot]	b257c50571	Bump aws-sdk-s3 from 1.84.1 to 1.85.0 (#15207 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.84.1 to 1.85.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-23 16:59:45 +09:00
Thibaut Girka	48f0f3ffee	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Upstream added the `bug` label to bug reports. Did the same. - `app/services/fan_out_on_write_service.rb`: Upstream put DMs back into timelines, glitch-soc was already doing it. Ignored upstream changes.	2020-11-20 13:27:48 +01:00
Daigo 3 Dango	541b9f8c1c	Use Ruby 2.7.2 (#15150 ) thwait and e2mmap are no longer needed in Gemfile. Gems properly require those.	2020-11-19 17:46:46 +01:00
dependabot[bot]	67ace1d890	Bump omniauth-cas from 1.1.1 to 2.0.0 (#15165 ) Bumps [omniauth-cas](https://github.com/dlindahl/omniauth-cas) from 1.1.1 to 2.0.0. - [Release notes](https://github.com/dlindahl/omniauth-cas/releases) - [Changelog](https://github.com/dlindahl/omniauth-cas/blob/master/CHANGELOG.md) - [Commits](https://github.com/dlindahl/omniauth-cas/compare/v1.1.1...v2.0.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-19 17:43:58 +01:00
dependabot[bot]	1a9099ca7c	Bump rubocop from 0.93.1 to 1.3.0 (#15170 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.93.1 to 1.3.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.93.1...v1.3.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-19 17:43:35 +01:00
dependabot[bot]	a3f3a9113d	Bump bootsnap from 1.5.0 to 1.5.1 (#15171 ) Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.5.0 to 1.5.1. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.5.0...v1.5.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-19 10:45:57 +09:00
dependabot[bot]	9b188a65be	Bump webmock from 3.9.5 to 3.10.0 (#15172 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.5 to 3.10.0. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.9.5...v3.10.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-19 10:42:05 +09:00
dependabot[bot]	78a3956729	Bump aws-sdk-s3 from 1.84.0 to 1.84.1 (#15173 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.84.0 to 1.84.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-19 10:28:31 +09:00
dependabot[bot]	beddf821d7	Bump json-ld from 3.1.4 to 3.1.5 (#15174 ) Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.4 to 3.1.5. - [Release notes](https://github.com/ruby-rdf/json-ld/releases) - [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.4...3.1.5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-19 10:25:12 +09:00
dependabot[bot]	feeaa6f50d	Bump oj from 3.10.15 to 3.10.16 (#15175 ) Bumps [oj](https://github.com/ohler55/oj) from 3.10.15 to 3.10.16. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.10.15...v3.10.16) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-19 10:22:24 +09:00
Thibaut Girka	c077cdaba7	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/relationships_controller.rb`: Upstream changed a line too close to a glitch-soc only line related to glitch-soc's theming system. Applied upstream changes accordingly.	2020-11-12 22:13:57 +01:00
dependabot[bot]	e9b4d97d88	Bump better_errors from 2.8.3 to 2.9.1 (#15117 ) Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.8.3 to 2.9.1. - [Release notes](https://github.com/BetterErrors/better_errors/releases) - [Commits](https://github.com/BetterErrors/better_errors/compare/v2.8.3...v2.9.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-10 23:11:15 +09:00
dependabot[bot]	501261cb90	Bump aws-sdk-s3 from 1.83.1 to 1.84.0 (#15135 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.83.1 to 1.84.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-10 18:29:30 +09:00
dependabot[bot]	c19f934fe8	Bump webmock from 3.9.3 to 3.9.5 (#15134 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.3 to 3.9.5. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.9.3...v3.9.5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-10 18:28:55 +09:00
dependabot[bot]	44fb2038c9	Bump bootsnap from 1.4.9 to 1.5.0 (#15116 ) Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.9 to 1.5.0. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.9...v1.5.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-10 18:23:24 +09:00
dependabot[bot]	21d1989b53	Bump parallel from 1.19.2 to 1.20.0 (#15115 ) Bumps [parallel](https://github.com/grosser/parallel) from 1.19.2 to 1.20.0. - [Release notes](https://github.com/grosser/parallel/releases) - [Commits](https://github.com/grosser/parallel/compare/v1.19.2...v1.20.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-10 18:20:41 +09:00
Thibaut Girka	412218af2e	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-07 18:23:02 +01:00
dependabot[bot]	f90620b2f3	Bump puma from 5.0.2 to 5.0.4 (#15085 ) Bumps [puma](https://github.com/puma/puma) from 5.0.2 to 5.0.4. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.0.2...v5.0.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-04 20:44:10 +01:00
dependabot[bot]	d60485cb72	Bump sidekiq-unique-jobs from 6.0.24 to 6.0.25 (#15083 ) Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.24 to 6.0.25. - [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases) - [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md) - [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/commits/v6.0.25) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-04 23:39:02 +09:00
dependabot[bot]	f43000d32c	Bump bootsnap from 1.4.8 to 1.4.9 (#15086 ) Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.8 to 1.4.9. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.8...v1.4.9) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-11-04 23:38:06 +09:00
Thibaut Girka	cd675fbe18	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-03 17:28:54 +01:00
dependabot[bot]	336b6a3c3f	Bump tzinfo-data from 1.2020.3 to 1.2020.4 (#15041 ) Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2020.3 to 1.2020.4. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2020.3...v1.2020.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-27 02:44:48 +09:00
dependabot[bot]	1eda0a9a25	Bump strong_migrations from 0.7.1 to 0.7.2 (#15044 ) Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.7.1 to 0.7.2. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.7.1...v0.7.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-27 02:43:19 +09:00
dependabot[bot]	8b4654fd85	Bump simplecov from 0.19.0 to 0.19.1 (#15042 ) Bumps [simplecov](https://github.com/simplecov-ruby/simplecov) from 0.19.0 to 0.19.1. - [Release notes](https://github.com/simplecov-ruby/simplecov/releases) - [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md) - [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.19.0...v0.19.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-27 02:41:36 +09:00
dependabot[bot]	652f6269f9	Bump aws-sdk-s3 from 1.83.0 to 1.83.1 (#15045 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.83.0 to 1.83.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-27 02:41:15 +09:00
dependabot[bot]	853d2761e4	Bump stackprof from 0.2.15 to 0.2.16 (#15046 ) Bumps [stackprof](https://github.com/tmm1/stackprof) from 0.2.15 to 0.2.16. - [Release notes](https://github.com/tmm1/stackprof/releases) - [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md) - [Commits](https://github.com/tmm1/stackprof/compare/v0.2.15...v0.2.16) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-27 02:40:37 +09:00
Thibaut Girka	9c34090db8	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/services/process_mentions_service.rb`: glitch-soc local-only handling, ported upstream changes	2020-10-26 15:48:16 +01:00
dependabot[bot]	39d7562f89	Bump omniauth-saml from 1.10.2 to 1.10.3 (#15007 ) Bumps [omniauth-saml](https://github.com/omniauth/omniauth-saml) from 1.10.2 to 1.10.3. - [Release notes](https://github.com/omniauth/omniauth-saml/releases) - [Changelog](https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md) - [Commits](https://github.com/omniauth/omniauth-saml/compare/v1.10.2...v1.10.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-22 12:46:54 +09:00
dependabot[bot]	90611276ed	Bump rubocop from 0.93.0 to 0.93.1 (#15004 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.93.0 to 0.93.1. - [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.93.0...v0.93.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-22 12:46:25 +09:00
dependabot[bot]	cf5f8a7657	Bump tzinfo-data from 1.2020.2 to 1.2020.3 (#15002 ) Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2020.2 to 1.2020.3. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2020.2...v1.2020.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-22 12:41:42 +09:00
dependabot[bot]	5598c670fc	Bump oj from 3.10.14 to 3.10.15 (#15009 ) Bumps [oj](https://github.com/ohler55/oj) from 3.10.14 to 3.10.15. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.10.14...v3.10.15) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-22 12:28:25 +09:00
dependabot[bot]	5567a50a25	Bump active_record_query_trace from 1.7 to 1.8 (#14999 ) Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace) from 1.7 to 1.8. - [Release notes](https://github.com/brunofacca/active-record-query-trace/releases) - [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/master/HISTORY.md) - [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.7...v1.8) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-22 12:11:20 +09:00
dependabot[bot]	0e37e2682c	Bump webmock from 3.9.1 to 3.9.3 (#14996 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.1 to 3.9.3. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.9.1...v3.9.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-22 11:50:01 +09:00
Thibaut Girka	ec49aa8175	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Updated upstream, we deleted it to not be flooded by Depandabot. Kept deleted. - `Gemfile.lock`: Puma updated on both sides, went for the most recent version. - `app/controllers/api/v1/mutes_controller.rb`: Upstream updated the serializer to support timed mutes, while glitch-soc added a custom API ages ago to get information that is already available elsewhere. Dropped the glitch-soc-specific API, went with upstream changes. - `app/javascript/core/admin.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/javascript/packs/public.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/models/mute.rb`: 🤷 - `app/models/user.rb`: New user setting added upstream while we have glitch-soc-specific user settings. Added upstream's user setting. - `config/settings.yml`: Upstream added a new user setting close to a user setting we had changed the defaults for. Added the new upstream setting. - `package.json`: Upstream dependency updated “too close” to a glitch-soc-specific dependency. No real conflict. Updated the dependency.	2020-10-21 19:10:50 +02:00
ThibG	ca56527140	Add follower synchronization mechanism (#14510 ) * Add support for followers synchronization on the receiving end Check the `collectionSynchronization` attribute on `Create` and `Announce` activities and synchronize followers from provided collection if possible. * Add tests for followers synchronization on the receiving end * Add support for follower synchronization on the sender's end * Add tests for the sending end * Switch from AS attributes to HTTP header Replace the custom `collectionSynchronization` ActivityStreams attribute by an HTTP header (`X-AS-Collection-Synchronization`) with the same syntax as the `Signature` header and the following fields: - `collectionId` to specify which collection to synchronize - `digest` for the SHA256 hex-digest of the list of followers known on the receiving instance (where “receiving instance” is determined by accounts sharing the same host name for their ActivityPub actor `id`) - `url` of a collection that should be fetched by the instance actor Internally, move away from the webfinger-based `domain` attribute and use account `uri` prefix to group accounts. * Add environment variable to disable followers synchronization Since the whole mechanism relies on some new preconditions that, in some extremely rare cases, might not be met, add an environment variable (DISABLE_FOLLOWERS_SYNCHRONIZATION) to disable the mechanism altogether and avoid followers being incorrectly removed. The current conditions are: 1. all managed accounts' actor `id` and inbox URL have the same URI scheme and netloc. 2. all accounts whose actor `id` or inbox URL share the same URI scheme and netloc as a managed account must be managed by the same Mastodon instance as well. As far as Mastodon is concerned, breaking those preconditions require extensive configuration changes in the reverse proxy and might also cause other issues. Therefore, this environment variable provides a way out for people with highly unusual configurations, and can be safely ignored for the overwhelming majority of Mastodon administrators. * Only set follower synchronization header on non-public statuses This is to avoid unnecessary computations and allow Follow-related activities to be handled by the usual codepath instead of going through the synchronization mechanism (otherwise, any Follow/Undo/Accept activity would trigger the synchronization mechanism even if processing the activity itself would be enough to re-introduce synchronization) * Change how ActivityPub::SynchronizeFollowersService handles follow requests If the remote lists a local follower which we only know has sent a follow request, consider the follow request as accepted instead of sending an Undo. * Integrate review feeback - rename X-AS-Collection-Synchronization to Collection-Synchronization - various minor refactoring and code style changes * Only select required fields when computing followers_hash * Use actor URI rather than webfinger domain in synchronization endpoint * Change hash computation to be a XOR of individual hashes Makes it much easier to be memory-efficient, and avoid sorting discrepancy issues. * Marginally improve followers_hash computation speed * Further improve hash computation performances by using pluck_each	2020-10-21 18:04:09 +02:00
dependabot[bot]	06c3d36395	Bump rubocop from 0.92.0 to 0.93.0 (#14967 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.92.0 to 0.93.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.92.0...v0.93.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-13 15:45:37 +09:00
dependabot[bot]	5b131f08e1	Bump tzinfo-data from 1.2020.1 to 1.2020.2 (#14966 ) Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2020.1 to 1.2020.2. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2020.1...v1.2020.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-13 15:27:16 +09:00
Eugen Rochko	7d985f2aac	Remove dependency on goldfinger gem (#14919 ) There are edge cases where requests to certain hosts timeout when using the vanilla HTTP.rb gem, which the goldfinger gem uses. Now that we no longer need to support OStatus servers, webfinger logic is so simple that there is no point encapsulating it in a gem, so we can just use our own Request class. With that, we benefit from more robust timeout code and IPv4/IPv6 resolution. Fix #14091	2020-10-08 00:34:57 +02:00
dependabot[bot]	8e6abbc4b9	Bump aws-sdk-core from 3.109.0 to 3.109.1 (#14943 ) Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby) from 3.109.0 to 3.109.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-06 17:49:56 +09:00
dependabot[bot]	66aa520acd	Bump better_errors from 2.8.1 to 2.8.3 (#14927 ) Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.8.1 to 2.8.3. - [Release notes](https://github.com/BetterErrors/better_errors/releases) - [Commits](https://github.com/BetterErrors/better_errors/compare/v2.8.1...v2.8.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-06 17:40:09 +09:00
dependabot[bot]	546e4899dd	Bump simple_form from 5.0.2 to 5.0.3 (#14923 ) Bumps [simple_form](https://github.com/plataformatec/simple_form) from 5.0.2 to 5.0.3. - [Release notes](https://github.com/plataformatec/simple_form/releases) - [Changelog](https://github.com/heartcombo/simple_form/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/simple_form/compare/v5.0.2...v5.0.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-06 17:17:27 +09:00
dependabot[bot]	d87a172972	Bump rspec-core from 3.9.2 to 3.9.3 (#14934 ) Bumps [rspec-core](https://github.com/rspec/rspec-core) from 3.9.2 to 3.9.3. - [Release notes](https://github.com/rspec/rspec-core/releases) - [Changelog](https://github.com/rspec/rspec-core/blob/main/Changelog.md) - [Commits](https://github.com/rspec/rspec-core/compare/v3.9.2...v3.9.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-06 17:11:59 +09:00
dependabot[bot]	2e9dc7eb98	Bump brakeman from 4.9.1 to 4.10.0 (#14933 ) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.9.1 to 4.10.0. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v4.9.1...v4.10.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-06 17:07:50 +09:00
dependabot[bot]	a30c997586	Bump hamlit from 2.11.1 to 2.13.0 (#14924 ) Bumps [hamlit](https://github.com/k0kubun/hamlit) from 2.11.1 to 2.13.0. - [Release notes](https://github.com/k0kubun/hamlit/releases) - [Changelog](https://github.com/k0kubun/hamlit/blob/master/CHANGELOG.md) - [Commits](https://github.com/k0kubun/hamlit/compare/v2.11.1...v2.13.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-06 17:06:23 +09:00
dependabot[bot]	80975c42fc	Bump regexp_parser from 1.8.0 to 1.8.1 (#14928 ) Bumps [regexp_parser](https://github.com/ammar/regexp_parser) from 1.8.0 to 1.8.1. - [Release notes](https://github.com/ammar/regexp_parser/releases) - [Changelog](https://github.com/ammar/regexp_parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/ammar/regexp_parser/compare/v1.8.0...v1.8.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-06 17:00:19 +09:00
dependabot[bot]	30941dd6ea	Bump aws-sdk-s3 from 1.81.1 to 1.83.0 (#14929 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.81.1 to 1.83.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-06 16:56:13 +09:00
dependabot[bot]	df8c6572d4	Bump rubocop-ast from 0.7.0 to 0.7.1 (#14899 ) Bumps [rubocop-ast](https://github.com/rubocop-hq/rubocop-ast) from 0.7.0 to 0.7.1. - [Release notes](https://github.com/rubocop-hq/rubocop-ast/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-ast/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-ast/compare/v0.7.0...v0.7.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-10-01 15:33:24 +09:00
mayaeh	2ee7e2c5c3	Bump puma from 5.0.1 to 5.0.2 (#14904 ) https://github.com/puma/puma/blob/master/History.md#502--2020-09-28	2020-09-30 14:32:00 +02:00
dependabot[bot]	a8367e26c9	Bump rubocop from 0.91.0 to 0.92.0 (#14885 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.91.0 to 0.92.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.91.0...v0.92.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-29 14:59:31 +09:00
dependabot[bot]	47fdf5c505	Bump simplecov-html from 0.12.2 to 0.12.3 (#14883 ) Bumps [simplecov-html](https://github.com/simplecov-ruby/simplecov-html) from 0.12.2 to 0.12.3. - [Release notes](https://github.com/simplecov-ruby/simplecov-html/releases) - [Changelog](https://github.com/simplecov-ruby/simplecov-html/blob/main/CHANGELOG.md) - [Commits](https://github.com/simplecov-ruby/simplecov-html/compare/v0.12.2...v0.12.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-29 04:11:43 +09:00
dependabot[bot]	469029b557	Bump parser from 2.7.1.4 to 2.7.1.5 (#14879 ) Bumps [parser](https://github.com/whitequark/parser) from 2.7.1.4 to 2.7.1.5. - [Release notes](https://github.com/whitequark/parser/releases) - [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/whitequark/parser/compare/v2.7.1.4...v2.7.1.5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-29 04:09:25 +09:00
dependabot[bot]	c9efb2028c	Bump sidekiq-unique-jobs from 6.0.23 to 6.0.24 (#14877 ) Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.23 to 6.0.24. - [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases) - [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md) - [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-29 04:07:42 +09:00
dependabot[bot]	7986e2e4d3	Bump raabro from 1.3.1 to 1.3.3 (#14888 ) Bumps [raabro](https://github.com/floraison/raabro) from 1.3.1 to 1.3.3. - [Release notes](https://github.com/floraison/raabro/releases) - [Changelog](https://github.com/floraison/raabro/blob/master/CHANGELOG.md) - [Commits](https://github.com/floraison/raabro/compare/v1.3.1...v1.3.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-29 04:06:27 +09:00
dependabot[bot]	3754c877ca	Bump aws-sdk-s3 from 1.81.0 to 1.81.1 (#14884 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.81.0 to 1.81.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-29 03:53:04 +09:00
dependabot[bot]	e88ddb0949	Bump pkg-config from 1.4.3 to 1.4.4 (#14881 ) Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config) from 1.4.3 to 1.4.4. - [Release notes](https://github.com/ruby-gnome/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.4.3...1.4.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-29 03:52:46 +09:00
ThibG	559e1dfd94	Bump puma to 5.0.1 (#14895 ) Fixes LoadError on some OSes/architectures	2020-09-28 18:11:54 +02:00
Thibaut Girka	1ce3acac27	Bump puma to 5.0.1 Fixes LoadError on some OSes/architectures	2020-09-28 17:56:16 +02:00
Thibaut Girka	a7aedebc31	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.	2020-09-28 14:13:30 +02:00
dependabot[bot]	b09810a505	Bump puma from 4.3.6 to 5.0.0 (#14830 ) Bumps [puma](https://github.com/puma/puma) from 4.3.6 to 5.0.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v4.3.6...v5.0.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-22 15:23:36 +02:00
dependabot[bot]	2dee03900e	Bump parallel_tests from 3.2.0 to 3.3.0 (#14843 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md) - [Commits](https://github.com/grosser/parallel_tests/compare/v3.2.0...v3.3.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-22 16:53:24 +09:00
dependabot[bot]	6926b771a5	Bump premailer from 1.13.1 to 1.14.2 (#14857 ) Bumps [premailer](https://github.com/premailer/premailer) from 1.13.1 to 1.14.2. - [Release notes](https://github.com/premailer/premailer/releases) - [Changelog](https://github.com/premailer/premailer/blob/master/CHANGELOG.md) - [Commits](https://github.com/premailer/premailer/compare/v1.13.1...v1.14.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-22 16:53:01 +09:00
dependabot[bot]	24da180901	Bump rubocop from 0.90.0 to 0.91.0 (#14835 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.90.0 to 0.91.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.90.0...v0.91.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-22 14:36:46 +09:00
dependabot[bot]	8c6312f853	Bump nio4r from 2.5.3 to 2.5.4 (#14837 ) Bumps [nio4r](https://github.com/socketry/nio4r) from 2.5.3 to 2.5.4. - [Release notes](https://github.com/socketry/nio4r/releases) - [Changelog](https://github.com/socketry/nio4r/blob/master/CHANGES.md) - [Commits](https://github.com/socketry/nio4r/compare/v2.5.3...v2.5.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-22 14:35:45 +09:00
dependabot[bot]	61fcb33ff2	Bump pkg-config from 1.4.2 to 1.4.3 (#14838 ) Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config) from 1.4.2 to 1.4.3. - [Release notes](https://github.com/ruby-gnome/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.4.2...1.4.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-22 14:35:30 +09:00
dependabot[bot]	36da58556c	Bump devise from 4.7.2 to 4.7.3 (#14845 ) Bumps [devise](https://github.com/plataformatec/devise) from 4.7.2 to 4.7.3. - [Release notes](https://github.com/plataformatec/devise/releases) - [Changelog](https://github.com/heartcombo/devise/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/devise/compare/v4.7.2...v4.7.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-22 14:33:37 +09:00
dependabot[bot]	19353df01d	Bump crack from 0.4.3 to 0.4.4 (#14833 ) Bumps [crack](https://github.com/jnunemaker/crack) from 0.4.3 to 0.4.4. - [Release notes](https://github.com/jnunemaker/crack/releases) - [Changelog](https://github.com/jnunemaker/crack/blob/master/History) - [Commits](https://github.com/jnunemaker/crack/compare/v0.4.3...v0.4.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-22 14:33:00 +09:00
dependabot[bot]	cc8c7d6477	Bump rubocop-rails from 2.8.0 to 2.8.1 (#14832 ) Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.8.0 to 2.8.1. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.8.0...v2.8.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-22 14:31:39 +09:00
dependabot[bot]	687e04aaa0	Bump fugit from 1.3.8 to 1.3.9 (#14829 ) Bumps [fugit](https://github.com/floraison/fugit) from 1.3.8 to 1.3.9. - [Release notes](https://github.com/floraison/fugit/releases) - [Changelog](https://github.com/floraison/fugit/blob/master/CHANGELOG.md) - [Commits](https://github.com/floraison/fugit/compare/v1.3.8...v1.3.9) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-22 14:30:53 +09:00
dependabot[bot]	dd7c70a615	Bump aws-sdk-s3 from 1.80.0 to 1.81.0 (#14826 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.80.0 to 1.81.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-21 21:25:53 +09:00
dependabot[bot]	41bf9384ae	Bump better_errors from 2.7.1 to 2.8.1 (#14825 ) Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.7.1 to 2.8.1. - [Release notes](https://github.com/BetterErrors/better_errors/releases) - [Commits](https://github.com/BetterErrors/better_errors/compare/v2.7.1...v2.8.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-21 16:12:11 +09:00
dependabot[bot]	b7d7485fe3	Bump faker from 2.13.0 to 2.14.0 (#14824 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.13.0 to 2.14.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.13.0...v2.14.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-21 16:11:55 +09:00
dependabot[bot]	75e4bd9413	Bump thor from 0.20.3 to 1.0.1 (#14783 ) Bumps [thor](https://github.com/erikhuda/thor) from 0.20.3 to 1.0.1. - [Release notes](https://github.com/erikhuda/thor/releases) - [Changelog](https://github.com/erikhuda/thor/blob/master/CHANGELOG.md) - [Commits](https://github.com/erikhuda/thor/compare/v0.20.3...v1.0.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-16 20:40:12 +02:00
dependabot[bot]	4de893113b	Bump rubocop-ast from 0.3.0 to 0.4.0 (#14785 ) Bumps [rubocop-ast](https://github.com/rubocop-hq/rubocop-ast) from 0.3.0 to 0.4.0. - [Release notes](https://github.com/rubocop-hq/rubocop-ast/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-ast/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-ast/compare/v0.3.0...v0.4.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-16 20:39:05 +02:00
dependabot[bot]	2cfbde41bc	Bump webmock from 3.8.3 to 3.9.1 (#14780 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.8.3 to 3.9.1. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.8.3...v3.9.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-16 12:45:52 +09:00
dependabot[bot]	8c8cb7f1f8	Bump sprockets-rails from 3.2.1 to 3.2.2 (#14788 ) Bumps [sprockets-rails](https://github.com/rails/sprockets-rails) from 3.2.1 to 3.2.2. - [Release notes](https://github.com/rails/sprockets-rails/releases) - [Commits](https://github.com/rails/sprockets-rails/compare/v3.2.1...v3.2.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-15 23:16:57 +09:00
dependabot[bot]	cbc45378ea	Bump ox from 2.13.3 to 2.13.4 (#14787 ) Bumps [ox](https://github.com/ohler55/ox) from 2.13.3 to 2.13.4. - [Release notes](https://github.com/ohler55/ox/releases) - [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/ox/compare/v2.13.3...v2.13.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-15 23:14:39 +09:00
dependabot[bot]	acdae79f33	Bump pghero from 2.7.0 to 2.7.2 (#14786 ) Bumps [pghero](https://github.com/ankane/pghero) from 2.7.0 to 2.7.2. - [Release notes](https://github.com/ankane/pghero/releases) - [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/pghero/compare/v2.7.0...v2.7.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-15 23:14:15 +09:00
dependabot[bot]	7a54779c72	Bump redis from 4.2.1 to 4.2.2 (#14784 ) Bumps [redis](https://github.com/redis/redis-rb) from 4.2.1 to 4.2.2. - [Release notes](https://github.com/redis/redis-rb/releases) - [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/redis-rb/compare/v4.2.1...v4.2.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-15 23:13:31 +09:00
dependabot[bot]	b677ae9e6f	Bump sidekiq from 6.1.1 to 6.1.2 (#14782 ) Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.1.1 to 6.1.2. - [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/v6.1.1...v6.1.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-15 23:13:12 +09:00
dependabot[bot]	b6985fdb6c	Bump rails from 5.2.4.3 to 5.2.4.4 (#14792 ) Bumps [rails](https://github.com/rails/rails) from 5.2.4.3 to 5.2.4.4. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.4.3...v5.2.4.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-14 22:08:13 +09:00
dependabot[bot]	3df3e63363	Bump aws-sdk-s3 from 1.79.1 to 1.80.0 (#14789 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.79.1 to 1.80.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-14 22:02:42 +09:00
Thibaut Girka	9748f074a3	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/api/v1/timelines/public_controller.rb - app/lib/feed_manager.rb - app/models/status.rb - app/services/precompute_feed_service.rb - app/workers/feed_insert_worker.rb - spec/models/status_spec.rb All conflicts are due to upstream refactoring feed management and us having local-only toots on top of that. Rewrote local-only toots management for upstream's changes.	2020-09-08 16:26:47 +02:00
dependabot[bot]	d1c68aa0d8	Bump puma from 4.3.5 to 4.3.6 (#14750 ) Bumps [puma](https://github.com/puma/puma) from 4.3.5 to 4.3.6. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v4.3.5...v4.3.6) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-08 08:23:13 +09:00
dependabot[bot]	60282931c1	Bump rubocop from 0.88.0 to 0.90.0 (#14747 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.88.0 to 0.90.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.88.0...v0.90.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-08 08:22:54 +09:00
dependabot[bot]	4dfa9a58de	Bump ox from 2.13.2 to 2.13.3 (#14751 ) Bumps [ox](https://github.com/ohler55/ox) from 2.13.2 to 2.13.3. - [Release notes](https://github.com/ohler55/ox/releases) - [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/ox/compare/v2.13.2...v2.13.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-08 05:22:50 +09:00
dependabot[bot]	ae36540455	Bump oj from 3.10.13 to 3.10.14 (#14749 ) Bumps [oj](https://github.com/ohler55/oj) from 3.10.13 to 3.10.14. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.10.13...v3.10.14) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-08 05:22:33 +09:00
dependabot[bot]	50f763fcd9	Bump aws-partitions from 1.363.0 to 1.365.0 (#14748 ) Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.363.0 to 1.365.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-08 05:21:01 +09:00
dependabot[bot]	1fb01185a9	Bump public_suffix from 4.0.5 to 4.0.6 (#14743 ) Bumps [public_suffix](https://github.com/weppos/publicsuffix-ruby) from 4.0.5 to 4.0.6. - [Release notes](https://github.com/weppos/publicsuffix-ruby/releases) - [Changelog](https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/weppos/publicsuffix-ruby/compare/v4.0.5...v4.0.6) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-08 05:15:39 +09:00
dependabot[bot]	744aeefb4e	Bump bcrypt from 3.1.15 to 3.1.16 (#14739 ) Bumps [bcrypt](https://github.com/codahale/bcrypt-ruby) from 3.1.15 to 3.1.16. - [Release notes](https://github.com/codahale/bcrypt-ruby/releases) - [Changelog](https://github.com/codahale/bcrypt-ruby/blob/master/CHANGELOG) - [Commits](https://github.com/codahale/bcrypt-ruby/compare/v3.1.15...v3.1.16) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-08 05:11:21 +09:00
dependabot[bot]	5179a8051c	Bump warden from 1.2.8 to 1.2.9 (#14738 ) Bumps [warden](https://github.com/hassox/warden) from 1.2.8 to 1.2.9. - [Release notes](https://github.com/hassox/warden/releases) - [Changelog](https://github.com/wardencommunity/warden/blob/master/CHANGELOG.md) - [Commits](https://github.com/hassox/warden/compare/v1.2.8...v1.2.9) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-08 05:10:49 +09:00
dependabot[bot]	0f39fc609f	Bump brakeman from 4.9.0 to 4.9.1 (#14737 ) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.9.0 to 4.9.1. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v4.9.0...v4.9.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-08 05:09:44 +09:00
dependabot[bot]	081571549c	Bump rdf from 3.1.5 to 3.1.6 (#14736 ) Bumps [rdf](https://github.com/ruby-rdf/rdf) from 3.1.5 to 3.1.6. - [Release notes](https://github.com/ruby-rdf/rdf/releases) - [Changelog](https://github.com/ruby-rdf/rdf/blob/develop/CHANGES.md) - [Commits](https://github.com/ruby-rdf/rdf/compare/3.1.5...3.1.6) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-08 05:08:59 +09:00
dependabot[bot]	507ed51983	Bump rubocop-rails from 2.6.0 to 2.8.0 (#14734 ) Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.6.0 to 2.8.0. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.6.0...v2.8.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-08 05:08:17 +09:00
dependabot[bot]	4c2f87e24e	Bump sidekiq-unique-jobs from 6.0.22 to 6.0.23 (#14735 ) Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.22 to 6.0.23. - [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases) - [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md) - [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.22...v6.0.23) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-08 05:06:23 +09:00
Thibaut Girka	3fefb7909b	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `config/webpack/shared.js`: Upstream has changed how Tesseract.js gets included and dropped a dependency. The conflict is caused by glitch-soc having different code due to its theming system. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream refactor/code style change in a place we replaced upstream's repo URL with ours. Ported upstram changes, keeping our repo URL. - `yarn.lock`: Upstream dropped dependencies, one of which was textually too close to a glitch-soc-specific dependency. Not a real conflict.	2020-09-01 17:02:18 +02:00
dependabot[bot]	8972e5f7f6	Bump rubocop from 0.86.0 to 0.88.0 (#14412 ) * Bump rubocop from 0.86.0 to 0.88.0 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.86.0 to 0.88.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.86.0...v0.88.0) Signed-off-by: dependabot[bot] <support@github.com> * Fix for latest RuboCop Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2020-09-01 03:04:00 +02:00
dependabot[bot]	10f180417e	Bump aws-partitions from 1.362.0 to 1.363.0 (#14713 ) Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.362.0 to 1.363.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-01 02:58:51 +02:00
dependabot[bot]	5c87891ea3	Bump hamlit from 2.11.0 to 2.11.1 (#14689 ) Bumps [hamlit](https://github.com/k0kubun/hamlit) from 2.11.0 to 2.11.1. - [Release notes](https://github.com/k0kubun/hamlit/releases) - [Changelog](https://github.com/k0kubun/hamlit/blob/master/CHANGELOG.md) - [Commits](https://github.com/k0kubun/hamlit/compare/v2.11.0...v2.11.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-01 02:57:12 +02:00
dependabot[bot]	e3b4d3179a	Bump aws-sdk-s3 from 1.78.0 to 1.79.1 (#14691 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.78.0 to 1.79.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-01 02:56:53 +02:00
dependabot[bot]	581c27510e	Bump aws-sdk-core from 3.104.4 to 3.105.0 (#14694 ) Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby) from 3.104.4 to 3.105.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-01 02:56:32 +02:00
dependabot[bot]	476f7e8248	Bump microformats from 4.2.0 to 4.2.1 (#14699 ) Bumps [microformats](https://github.com/microformats/microformats-ruby) from 4.2.0 to 4.2.1. - [Release notes](https://github.com/microformats/microformats-ruby/releases) - [Commits](https://github.com/microformats/microformats-ruby/compare/v4.2.0...v4.2.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-01 02:56:08 +02:00
dependabot[bot]	0f568f8431	Bump loofah from 2.6.0 to 2.7.0 (#14701 ) Bumps [loofah](https://github.com/flavorjones/loofah) from 2.6.0 to 2.7.0. - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md) - [Commits](https://github.com/flavorjones/loofah/compare/v2.6.0...v2.7.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-01 02:55:48 +02:00
dependabot[bot]	65d78d4f94	Bump parallel_tests from 3.1.0 to 3.2.0 (#14702 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md) - [Commits](https://github.com/grosser/parallel_tests/compare/v3.1.0...v3.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-01 02:55:16 +02:00
dependabot[bot]	af2396433a	Bump oj from 3.10.12 to 3.10.13 (#14704 ) Bumps [oj](https://github.com/ohler55/oj) from 3.10.12 to 3.10.13. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.10.12...v3.10.13) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-01 02:54:34 +02:00
Thibaut Girka	8c3c27bf06	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.	2020-08-30 16:13:08 +02:00
dependabot[bot]	22081567ab	Bump net-ldap from 0.16.2 to 0.16.3 (#14627 ) Bumps [net-ldap](https://github.com/ruby-ldap/ruby-net-ldap) from 0.16.2 to 0.16.3. - [Release notes](https://github.com/ruby-ldap/ruby-net-ldap/releases) - [Changelog](https://github.com/ruby-ldap/ruby-net-ldap/blob/master/History.rdoc) - [Commits](https://github.com/ruby-ldap/ruby-net-ldap/compare/v0.16.2...v0.16.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-25 21:02:06 +09:00
dependabot[bot]	eeff3bf9e0	Bump elasticsearch-transport from 7.8.1 to 7.9.0 (#14624 ) Bumps [elasticsearch-transport](https://github.com/elastic/elasticsearch-ruby) from 7.8.1 to 7.9.0. - [Release notes](https://github.com/elastic/elasticsearch-ruby/releases) - [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch-ruby/compare/v7.8.1...v7.9.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-25 20:58:59 +09:00
dependabot[bot]	7ab7fc7577	Bump redis-namespace from 1.7.0 to 1.8.0 (#14623 ) Bumps [redis-namespace](https://github.com/resque/redis-namespace) from 1.7.0 to 1.8.0. - [Release notes](https://github.com/resque/redis-namespace/releases) - [Changelog](https://github.com/resque/redis-namespace/blob/master/CHANGELOG.md) - [Commits](https://github.com/resque/redis-namespace/compare/v1.7.0...v1.8.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-25 20:57:44 +09:00
dependabot[bot]	9a1c350924	Bump jwt from 2.2.1 to 2.2.2 (#14621 ) Bumps [jwt](https://github.com/jwt/ruby-jwt) from 2.2.1 to 2.2.2. - [Release notes](https://github.com/jwt/ruby-jwt/releases) - [Changelog](https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md) - [Commits](https://github.com/jwt/ruby-jwt/compare/v2.2.1...v2.2.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-25 20:53:09 +09:00
dependabot[bot]	fc52962667	Bump webpacker from 5.2.0 to 5.2.1 (#14619 ) Bumps [webpacker](https://github.com/rails/webpacker) from 5.2.0 to 5.2.1. - [Release notes](https://github.com/rails/webpacker/releases) - [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/webpacker/compare/v5.2.0...v5.2.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-25 20:49:20 +09:00
dependabot[bot]	5678b195ff	Bump oj from 3.10.8 to 3.10.12 (#14620 ) Bumps [oj](https://github.com/ohler55/oj) from 3.10.8 to 3.10.12. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.10.8...v3.10.12) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-25 20:45:57 +09:00
dependabot[bot]	32567acdd0	Bump aws-sdk-core from 3.104.3 to 3.104.4 (#14618 ) Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby) from 3.104.3 to 3.104.4. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-25 20:44:58 +09:00
santiagorodriguez96	e8d41bc2fe	Add WebAuthn as an alternative 2FA method (#14466 ) * feat: add possibility of adding WebAuthn security keys to use as 2FA This adds a basic UI for enabling WebAuthn 2FA. We did a little refactor to the Settings page for editing the 2FA methods – now it will list the methods that are available to the user (TOTP and WebAuthn) and from there they'll be able to add or remove any of them. Also, it's worth mentioning that for enabling WebAuthn it's required to have TOTP enabled, so the first time that you go to the 2FA Settings page, you'll be asked to set it up. This work was inspired by the one donde by Github in their platform, and despite it could be approached in different ways, we decided to go with this one given that we feel that this gives a great UX. Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com> * feat: add request for WebAuthn as second factor at login if enabled This commits adds the feature for using WebAuthn as a second factor for login when enabled. If users have WebAuthn enabled, now a page requesting for the use of a WebAuthn credential for log in will appear, although a link redirecting to the old page for logging in using a two-factor code will also be present. Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com> * feat: add possibility of deleting WebAuthn Credentials Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com> * feat: disable WebAuthn when an Admin disables 2FA for a user Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com> * feat: remove ability to disable TOTP leaving only WebAuthn as 2FA Following examples form other platforms like Github, we decided to make Webauthn 2FA secondary to 2FA with TOTP, so that we removed the possibility of removing TOTP authentication only, leaving users with just WEbAuthn as 2FA. Instead, users will have to click on 'Disable 2FA' in order to remove second factor auth. The reason for WebAuthn being secondary to TOPT is that in that way, users will still be able to log in using their code from their phone's application if they don't have their security keys with them – or maybe even lost them. * We had to change a little the flow for setting up TOTP, given that now it's possible to setting up again if you already had TOTP, in order to let users modify their authenticator app – given that now it's not possible for them to disable TOTP and set it up again with another authenticator app. So, basically, now instead of storing the new `otp_secret` in the user, we store it in the session until the process of set up is finished. This was because, as it was before, when users clicked on 'Edit' in the new two-factor methods lists page, but then went back without finishing the flow, their `otp_secret` had been changed therefore invalidating their previous authenticator app, making them unable to log in again using TOTP. Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com> * refactor: fix eslint errors The PR build was failing given that linting returning some errors. This commit attempts to fix them. * refactor: normalize i18n translations The build was failing given that i18n translations files were not normalized. This commits fixes that. * refactor: avoid having the webauthn gem locked to a specific version * refactor: use symbols for routes without '/' * refactor: avoid sending webauthn disabled email when 2FA is disabled When an admins disable 2FA for users, we were sending two mails to them, one notifying that 2FA was disabled and the other to notify that WebAuthn was disabled. As the second one is redundant since the first email includes it, we can remove it and send just one email to users. * refactor: avoid creating new env variable for webauthn_origin config * refactor: improve flash error messages for webauthn pages Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>	2020-08-24 16:46:27 +02:00
dependabot[bot]	9b2648b30a	Bump simplecov from 0.18.5 to 0.19.0 (#14590 ) Bumps [simplecov](https://github.com/simplecov-ruby/simplecov) from 0.18.5 to 0.19.0. - [Release notes](https://github.com/simplecov-ruby/simplecov/releases) - [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md) - [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.18.5...v0.19.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-21 05:31:28 +09:00
dependabot[bot]	c5092f8b62	Bump webpacker from 5.1.1 to 5.2.0 (#14586 ) Bumps [webpacker](https://github.com/rails/webpacker) from 5.1.1 to 5.2.0. - [Release notes](https://github.com/rails/webpacker/releases) - [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/webpacker/compare/v5.1.1...v5.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-21 05:23:52 +09:00
dependabot[bot]	36289b6a61	Bump redis-rack from 2.1.2 to 2.1.3 (#14584 ) Bumps [redis-rack](http://redis-store.org/redis-rack) from 2.1.2 to 2.1.3. Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-21 05:15:38 +09:00
dependabot[bot]	8ba7922639	Bump aws-sdk-s3 from 1.76.0 to 1.78.0 (#14583 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.76.0 to 1.78.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-21 05:14:30 +09:00
dependabot[bot]	919a554efa	Bump bootsnap from 1.4.7 to 1.4.8 (#14581 ) Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.7 to 1.4.8. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.7...v1.4.8) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-21 05:11:37 +09:00
Thibaut Girka	74a9affdcc	Merge branch 'master' into glitch-soc/merge-upstream	2020-08-19 19:16:41 +02:00
dependabot[bot]	8930841716	Bump aws-partitions from 1.353.0 to 1.356.0 (#14578 ) Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.353.0 to 1.356.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-17 03:37:55 +09:00
dependabot[bot]	55e07d9840	Bump tty-color from 0.5.1 to 0.5.2 (#14547 ) Bumps [tty-color](https://github.com/piotrmurach/tty-color) from 0.5.1 to 0.5.2. - [Release notes](https://github.com/piotrmurach/tty-color/releases) - [Changelog](https://github.com/piotrmurach/tty-color/blob/master/CHANGELOG.md) - [Commits](https://github.com/piotrmurach/tty-color/compare/v0.5.1...v0.5.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-17 02:32:28 +09:00
dependabot[bot]	c3cb6b1151	Bump fugit from 1.3.6 to 1.3.8 (#14548 ) Bumps [fugit](https://github.com/floraison/fugit) from 1.3.6 to 1.3.8. - [Release notes](https://github.com/floraison/fugit/releases) - [Changelog](https://github.com/floraison/fugit/blob/master/CHANGELOG.md) - [Commits](https://github.com/floraison/fugit/compare/v1.3.6...v1.3.8) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-17 02:29:34 +09:00
dependabot[bot]	c917b53c53	Bump pkg-config from 1.4.1 to 1.4.2 (#14549 ) Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/ruby-gnome/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.4.1...1.4.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-17 02:25:21 +09:00
dependabot[bot]	24b8a7af41	Bump premailer from 1.12.1 to 1.13.1 (#14544 ) Bumps [premailer](https://github.com/premailer/premailer) from 1.12.1 to 1.13.1. - [Release notes](https://github.com/premailer/premailer/releases) - [Changelog](https://github.com/premailer/premailer/blob/master/CHANGELOG.md) - [Commits](https://github.com/premailer/premailer/compare/v1.12.1...v1.13.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-17 02:24:46 +09:00
dependabot[bot]	fd31509c53	Bump chunky_png from 1.3.11 to 1.3.12 (#14545 ) Bumps [chunky_png](https://github.com/wvanbergen/chunky_png) from 1.3.11 to 1.3.12. - [Release notes](https://github.com/wvanbergen/chunky_png/releases) - [Changelog](https://github.com/wvanbergen/chunky_png/blob/master/CHANGELOG.rdoc) - [Commits](https://github.com/wvanbergen/chunky_png/compare/v1.3.11...v1.3.12) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-17 02:22:35 +09:00
dependabot[bot]	f74c373663	Bump rdf from 3.1.4 to 3.1.5 (#14543 ) Bumps [rdf](https://github.com/ruby-rdf/rdf) from 3.1.4 to 3.1.5. - [Release notes](https://github.com/ruby-rdf/rdf/releases) - [Changelog](https://github.com/ruby-rdf/rdf/blob/develop/CHANGES.md) - [Commits](https://github.com/ruby-rdf/rdf/compare/3.1.4...3.1.5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-17 02:21:52 +09:00
dependabot[bot]	f5b87ac4db	Bump aws-sdk-s3 from 1.75.0 to 1.76.0 (#14542 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.75.0 to 1.76.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-17 02:18:25 +09:00
dependabot[bot]	8a9d9509ec	Bump brakeman from 4.8.2 to 4.9.0 (#14540 ) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.8.2 to 4.9.0. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v4.8.2...v4.9.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-17 02:17:00 +09:00
dependabot[bot]	4d67df6155	Bump concurrent-ruby from 1.1.6 to 1.1.7 (#14539 ) Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.1.6 to 1.1.7. - [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases) - [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.6...v1.1.7) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-17 02:16:12 +09:00
ThibG	a55ad84251	Remove dependency on unused and unmaintained http_parser.rb gem (#14574 ) It seems that years ago, the “http” gem dependend on the “http_parser.rb” gem (it now depends on the “http-parser” gem), and, still years ago, we pulled it from git in order to benefit from a bugfix that wasn't released yet (#7467).	2020-08-14 18:04:00 +02:00
Thibaut Girka	5d5b9e2f62	Merge branch 'master' into glitch-soc/merge-upstream	2020-08-08 19:10:40 +02:00
dependabot[bot]	c1c0a0e3a2	Bump excon from 0.75.0 to 0.76.0 (#14490 ) Bumps [excon](https://github.com/excon/excon) from 0.75.0 to 0.76.0. - [Release notes](https://github.com/excon/excon/releases) - [Changelog](https://github.com/excon/excon/blob/master/changelog.txt) - [Commits](https://github.com/excon/excon/compare/v0.75.0...v0.76.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-07 00:35:32 +09:00
dependabot[bot]	a61329199e	Bump pghero from 2.6.0 to 2.7.0 (#14518 ) Bumps [pghero](https://github.com/ankane/pghero) from 2.6.0 to 2.7.0. - [Release notes](https://github.com/ankane/pghero/releases) - [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/pghero/compare/v2.6.0...v2.7.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-07 00:34:12 +09:00
dependabot[bot]	63bbe6cab8	Bump rubocop-ast from 0.2.0 to 0.3.0 (#14498 ) Bumps [rubocop-ast](https://github.com/rubocop-hq/rubocop-ast) from 0.2.0 to 0.3.0. - [Release notes](https://github.com/rubocop-hq/rubocop-ast/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-ast/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-ast/compare/v0.2.0...v0.3.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-05 05:31:57 +09:00
dependabot[bot]	3cd76411d2	Bump elasticsearch from 7.8.0 to 7.8.1 (#14501 ) Bumps [elasticsearch](https://github.com/elastic/elasticsearch-ruby) from 7.8.0 to 7.8.1. - [Release notes](https://github.com/elastic/elasticsearch-ruby/releases) - [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch-ruby/compare/v7.8.0...v7.8.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-05 05:30:54 +09:00
dependabot[bot]	97afc88764	Bump aws-partitions from 1.345.0 to 1.349.0 (#14489 ) Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.345.0 to 1.349.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-05 05:24:03 +09:00
Thibaut Girka	2cfa142961	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `yarn.lock`: No real conflict, just a glitch-soc-only dependency textually too close to one updated upstream. Ported upstream changes.	2020-08-01 20:24:23 +02:00
dependabot[bot]	4f2b06b6b5	Bump strong_migrations from 0.6.8 to 0.7.1 (#14463 ) Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.6.8 to 0.7.1. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.6.8...v0.7.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-29 02:18:59 +09:00
dependabot[bot]	3f94572a88	Bump posix-spawn from 58465d2e213991f8afb13b984854a49fcdcc980c to 0.3.15 (#14433 ) Bumps [posix-spawn](https://github.com/rtomayko/posix-spawn) from 58465d2e213991f8afb13b984854a49fcdcc980c to 0.3.15. This release includes the previously tagged commit. - [Release notes](https://github.com/rtomayko/posix-spawn/releases) - [Commits](`58465d2e21`...v0.3.15) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-29 00:59:29 +09:00
dependabot[bot]	87a058c8e0	Bump sidekiq from 6.1.0 to 6.1.1 (#14427 ) Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.1.0 to 6.1.1. - [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/v6.1.0...v6.1.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-29 00:54:00 +09:00
dependabot[bot]	93c3d04254	Bump tty-prompt from 0.21.0 to 0.22.0 (#14430 ) Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.21.0 to 0.22.0. - [Release notes](https://github.com/piotrmurach/tty-prompt/releases) - [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md) - [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.21.0...v0.22.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-29 00:51:15 +09:00
dependabot[bot]	10a4892481	Bump capistrano-rails from 1.5.0 to 1.6.1 (#14415 ) Bumps [capistrano-rails](https://github.com/capistrano/rails) from 1.5.0 to 1.6.1. - [Release notes](https://github.com/capistrano/rails/releases) - [Commits](https://github.com/capistrano/rails/compare/v1.5.0...v1.6.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-28 12:24:53 +09:00
dependabot[bot]	7e37ea93d5	Bump multi_json from 1.14.1 to 1.15.0 (#14400 ) Bumps [multi_json](https://github.com/intridea/multi_json) from 1.14.1 to 1.15.0. - [Release notes](https://github.com/intridea/multi_json/releases) - [Changelog](https://github.com/intridea/multi_json/blob/master/CHANGELOG.md) - [Commits](https://github.com/intridea/multi_json/compare/v1.14.1...v1.15.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-28 10:18:02 +09:00
dependabot[bot]	a148f65891	Bump thwait from 0.1.0 to 0.2.0 (#14436 ) Bumps [thwait](https://github.com/ruby/thwait) from 0.1.0 to 0.2.0. - [Release notes](https://github.com/ruby/thwait/releases) - [Commits](https://github.com/ruby/thwait/compare/v0.1.0...v0.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-28 07:01:59 +09:00
dependabot[bot]	8cd1bcf8d4	Bump parallel_tests from 3.0.0 to 3.1.0 (#14406 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md) - [Commits](https://github.com/grosser/parallel_tests/compare/v3.0.0...v3.1.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-28 06:57:34 +09:00
dependabot[bot]	2912f01ddf	Bump premailer from 1.11.1 to 1.12.1 (#14437 ) Bumps [premailer](https://github.com/premailer/premailer) from 1.11.1 to 1.12.1. - [Release notes](https://github.com/premailer/premailer/releases) - [Changelog](https://github.com/premailer/premailer/blob/master/CHANGELOG.md) - [Commits](https://github.com/premailer/premailer/compare/v1.11.1...v1.12.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-28 06:56:47 +09:00
dependabot[bot]	c7365688c0	Bump dotenv-rails from 2.7.5 to 2.7.6 (#14405 ) Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.7.5 to 2.7.6. - [Release notes](https://github.com/bkeepers/dotenv/releases) - [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md) - [Commits](https://github.com/bkeepers/dotenv/compare/v2.7.5...v2.7.6) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-28 06:00:00 +09:00
dependabot[bot]	418ac90305	Bump rubocop-ast from 0.1.0 to 0.2.0 (#14404 ) Bumps [rubocop-ast](https://github.com/rubocop-hq/rubocop-ast) from 0.1.0 to 0.2.0. - [Release notes](https://github.com/rubocop-hq/rubocop-ast/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-ast/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-ast/compare/v0.1.0...v0.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-28 03:31:33 +09:00
dependabot[bot]	7647ce77f5	Bump fastimage from 2.1.7 to 2.2.0 (#14403 ) Bumps [fastimage](https://github.com/sdsykes/fastimage) from 2.1.7 to 2.2.0. - [Release notes](https://github.com/sdsykes/fastimage/releases) - [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.7...v2.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-28 03:31:03 +09:00
dependabot[bot]	e1cbccd9e4	Bump capistrano-rbenv from 2.1.6 to 2.2.0 (#14411 ) Bumps [capistrano-rbenv](https://github.com/capistrano/rbenv) from 2.1.6 to 2.2.0. - [Release notes](https://github.com/capistrano/rbenv/releases) - [Commits](https://github.com/capistrano/rbenv/compare/v2.1.6...v2.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-28 03:24:09 +09:00
dependabot[bot]	be7d88f2a4	Bump oj from 3.10.6 to 3.10.8 (#14428 ) Bumps [oj](https://github.com/ohler55/oj) from 3.10.6 to 3.10.8. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.10.6...v3.10.8) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-28 03:19:02 +09:00
dependabot[bot]	6bae61064b	Bump bootsnap from 1.4.6 to 1.4.7 (#14429 ) Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.6 to 1.4.7. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.6...v1.4.7) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-28 03:07:33 +09:00
dependabot[bot]	e55f100336	Bump stoplight from 2.2.0 to 2.2.1 (#14432 ) Bumps [stoplight](https://github.com/orgsync/stoplight) from 2.2.0 to 2.2.1. - [Release notes](https://github.com/orgsync/stoplight/releases) - [Changelog](https://github.com/orgsync/stoplight/blob/master/CHANGELOG.md) - [Commits](https://github.com/orgsync/stoplight/compare/v2.2.0...v2.2.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-28 03:00:35 +09:00
dependabot[bot]	e01e08b8f6	Bump websocket-driver from 0.7.2 to 0.7.3 (#14410 ) Bumps [websocket-driver](https://github.com/faye/websocket-driver-ruby) from 0.7.2 to 0.7.3. - [Release notes](https://github.com/faye/websocket-driver-ruby/releases) - [Changelog](https://github.com/faye/websocket-driver-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/faye/websocket-driver-ruby/compare/0.7.2...0.7.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-28 02:54:09 +09:00
dependabot[bot]	7d1dc4a54d	Bump bcrypt from 3.1.13 to 3.1.15 (#14402 ) Bumps [bcrypt](https://github.com/codahale/bcrypt-ruby) from 3.1.13 to 3.1.15. - [Release notes](https://github.com/codahale/bcrypt-ruby/releases) - [Changelog](https://github.com/codahale/bcrypt-ruby/blob/master/CHANGELOG) - [Commits](https://github.com/codahale/bcrypt-ruby/compare/v3.1.13...v3.1.15) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-28 02:48:40 +09:00
dependabot[bot]	2d41be6591	Bump tty-screen from 0.8.0 to 0.8.1 (#14421 ) Bumps [tty-screen](https://github.com/piotrmurach/tty-screen) from 0.8.0 to 0.8.1. - [Release notes](https://github.com/piotrmurach/tty-screen/releases) - [Changelog](https://github.com/piotrmurach/tty-screen/blob/master/CHANGELOG.md) - [Commits](https://github.com/piotrmurach/tty-screen/compare/v0.8.0...v0.8.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-28 02:37:07 +09:00
dependabot[bot]	e21a69c564	Bump nokogiri from 1.10.9 to 1.10.10 (#14419 ) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.9 to 1.10.10. - [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.9...v1.10.10) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-28 02:28:57 +09:00
dependabot[bot]	bfc73a1453	Bump aws-sdk-s3 from 1.73.0 to 1.75.0 (#14401 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.73.0 to 1.75.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-28 02:26:13 +09:00
dependabot[bot]	42986a4dad	Bump pghero from 2.5.1 to 2.6.0 (#14423 ) Bumps [pghero](https://github.com/ankane/pghero) from 2.5.1 to 2.6.0. - [Release notes](https://github.com/ankane/pghero/releases) - [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/pghero/compare/v2.5.1...v2.6.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-28 02:25:06 +09:00
Thibaut Girka	e9ad99bc93	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `package.json`: Not really a conflict, just some glitch-soc-specific dependency too close to an upstream-updated one.	2020-07-07 15:58:45 +02:00
dependabot[bot]	9db1388a8e	Bump diff-lcs from 1.4.3 to 1.4.4 (#14220 ) Bumps [diff-lcs](https://github.com/halostatue/diff-lcs) from 1.4.3 to 1.4.4. - [Release notes](https://github.com/halostatue/diff-lcs/releases) - [Changelog](https://github.com/halostatue/diff-lcs/blob/master/History.md) - [Commits](https://github.com/halostatue/diff-lcs/compare/v1.4.3...v1.4.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-06 23:19:04 +09:00
dependabot[bot]	8620f54884	Bump rdf from 3.1.3 to 3.1.4 (#14225 ) Bumps [rdf](https://github.com/ruby-rdf/rdf) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/ruby-rdf/rdf/releases) - [Changelog](https://github.com/ruby-rdf/rdf/blob/develop/CHANGES.md) - [Commits](https://github.com/ruby-rdf/rdf/compare/3.1.3...3.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-06 23:18:25 +09:00
dependabot[bot]	769f74034c	Bump omniauth-saml from 1.10.1 to 1.10.2 (#14226 ) Bumps [omniauth-saml](https://github.com/omniauth/omniauth-saml) from 1.10.1 to 1.10.2. - [Release notes](https://github.com/omniauth/omniauth-saml/releases) - [Changelog](https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md) - [Commits](https://github.com/omniauth/omniauth-saml/compare/v1.10.1...v1.10.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-06 23:18:06 +09:00
dependabot[bot]	2c7c9707b3	Bump json from 2.3.0 to 2.3.1 (#14227 ) Bumps [json](https://github.com/flori/json) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/flori/json/releases) - [Changelog](https://github.com/flori/json/blob/master/CHANGES.md) - [Commits](https://github.com/flori/json/compare/v2.3.0...v2.3.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-06 23:17:51 +09:00
dependabot[bot]	3a530b7296	Bump aws-sdk-s3 from 1.72.0 to 1.73.0 (#14219 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.72.0 to 1.73.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-06 22:07:46 +09:00
Thibaut Girka	2d8be0a6e1	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `.env.production.sample`: Upstream changed it completely. Changed ours to merge upstream's new structure, but keeping most of the information.	2020-07-05 19:35:56 +02:00
Eugen Rochko	99f3a55540	Add color extraction for audio thumbnails (#14209 )	2020-07-05 18:28:25 +02:00
Thibaut Girka	45deca65b3	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there.	2020-07-01 19:23:14 +02:00
Eugen Rochko	6d23d40420	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191 )	2020-07-01 19:05:21 +02:00
Thibaut Girka	9c3b9d5ab9	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `.env.production.sample`: Upstream deleted it, I decided to keep it. - `package.json`: Upstream updated a dependency textually too close to wavesurfer.js which has been deleted from upstream but is kept in glitch-soc for now.	2020-06-30 23:00:20 +02:00
dependabot[bot]	ce9ae9aa50	Bump diff-lcs from 1.3 to 1.4.3 (#14186 ) Bumps [diff-lcs](https://github.com/halostatue/diff-lcs) from 1.3 to 1.4.3. - [Release notes](https://github.com/halostatue/diff-lcs/releases) - [Changelog](https://github.com/halostatue/diff-lcs/blob/master/History.md) - [Commits](https://github.com/halostatue/diff-lcs/compare/v1.3...v1.4.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-30 13:18:38 +09:00
dependabot[bot]	742b0fedbd	Bump faker from 2.12.0 to 2.13.0 (#14174 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.12.0 to 2.13.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.12.0...v2.13.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-30 13:18:25 +09:00
dependabot[bot]	5c43dbb855	Bump redis-store from 1.8.2 to 1.9.0 (#14160 ) Bumps [redis-store](https://github.com/jodosha/redis-store) from 1.8.2 to 1.9.0. - [Release notes](https://github.com/jodosha/redis-store/releases) - [Changelog](https://github.com/redis-store/redis-store/blob/master/CHANGELOG.md) - [Commits](https://github.com/jodosha/redis-store/compare/v1.8.2...v1.9.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-29 22:45:50 +09:00
dependabot[bot]	e60ba7ca17	Bump pghero from 2.5.0 to 2.5.1 (#14163 ) Bumps [pghero](https://github.com/ankane/pghero) from 2.5.0 to 2.5.1. - [Release notes](https://github.com/ankane/pghero/releases) - [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/pghero/compare/v2.5.0...v2.5.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-29 22:44:43 +09:00
dependabot[bot]	bc6ac0ae09	Bump rails-controller-testing from 1.0.4 to 1.0.5 (#14161 ) Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing) from 1.0.4 to 1.0.5. - [Release notes](https://github.com/rails/rails-controller-testing/releases) - [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.4...v1.0.5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-29 22:43:34 +09:00
dependabot[bot]	aaef3b5f3e	Bump rubocop from 0.85.1 to 0.86.0 (#14171 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.85.1 to 0.86.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.85.1...v0.86.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-29 21:44:32 +09:00
dependabot[bot]	a0f65e5909	Bump aws-sdk-s3 from 1.69.0 to 1.72.0 (#14158 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.69.0 to 1.72.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-29 21:43:31 +09:00
Thibaut Girka	a01674fb2b	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-26 13:02:14 +02:00
dependabot[bot]	21f9cc4c62	Bump aws-sdk-s3 from 1.68.1 to 1.69.0 (#14109 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.68.1 to 1.69.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-25 17:49:34 +09:00
dependabot[bot]	3a8ccbae63	Bump aws-sigv4 from 1.1.4 to 1.2.0 (#14107 ) Bumps [aws-sigv4](https://github.com/aws/aws-sdk-ruby) from 1.1.4 to 1.2.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sigv4/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.1.4...1.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-25 17:49:05 +09:00
dependabot[bot]	d272a324c1	Bump capybara from 3.32.2 to 3.33.0 (#14105 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.32.2 to 3.33.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.32.2...3.33.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-25 17:48:40 +09:00
dependabot[bot]	034bd611ca	Bump rspec-sidekiq from 3.0.3 to 3.1.0 (#14104 ) Bumps [rspec-sidekiq](https://github.com/philostler/rspec-sidekiq) from 3.0.3 to 3.1.0. - [Release notes](https://github.com/philostler/rspec-sidekiq/releases) - [Changelog](https://github.com/philostler/rspec-sidekiq/blob/develop/CHANGES.md) - [Commits](https://github.com/philostler/rspec-sidekiq/compare/v3.0.3...v3.1.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-25 17:47:34 +09:00
dependabot[bot]	0ab97c7b20	Bump excon from 0.74.0 to 0.75.0 (#14103 ) Bumps [excon](https://github.com/excon/excon) from 0.74.0 to 0.75.0. - [Release notes](https://github.com/excon/excon/releases) - [Changelog](https://github.com/excon/excon/blob/master/changelog.txt) - [Commits](https://github.com/excon/excon/compare/v0.74.0...v0.75.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-25 17:46:11 +09:00
dependabot[bot]	759662aa3f	Bump elasticsearch from 7.7.0 to 7.8.0 (#14108 ) Bumps [elasticsearch](https://github.com/elastic/elasticsearch-ruby) from 7.7.0 to 7.8.0. - [Release notes](https://github.com/elastic/elasticsearch-ruby/releases) - [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch-ruby/compare/7.7.0...v7.8.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-25 10:32:59 +02:00
dependabot[bot]	5b2602fd1d	Bump loofah from 2.5.0 to 2.6.0 (#14071 ) Bumps [loofah](https://github.com/flavorjones/loofah) from 2.5.0 to 2.6.0. - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md) - [Commits](https://github.com/flavorjones/loofah/compare/v2.5.0...v2.6.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-25 17:27:36 +09:00
dependabot[bot]	32f330dbc0	Bump rdf from 3.1.2 to 3.1.3 (#14070 ) Bumps [rdf](https://github.com/ruby-rdf/rdf) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/ruby-rdf/rdf/releases) - [Changelog](https://github.com/ruby-rdf/rdf/blob/develop/CHANGES.md) - [Commits](https://github.com/ruby-rdf/rdf/compare/3.1.2...3.1.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-25 17:27:10 +09:00
dependabot[bot]	6d12067b7f	Bump parser from 2.7.1.3 to 2.7.1.4 (#14101 ) Bumps [parser](https://github.com/whitequark/parser) from 2.7.1.3 to 2.7.1.4. - [Release notes](https://github.com/whitequark/parser/releases) - [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/whitequark/parser/compare/v2.7.1.3...v2.7.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-25 17:22:53 +09:00
dependabot[bot]	844393ec29	Bump aws-partitions from 1.329.0 to 1.332.0 (#14110 ) Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.329.0 to 1.332.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-25 17:22:35 +09:00
Thibaut Girka	aae60a2366	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes.	2020-06-24 15:33:41 +02:00
dependabot[bot]	25cd4998fe	Bump aws-sdk-core from 3.99.2 to 3.100.0 (#14072 ) Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby) from 3.99.2 to 3.100.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-21 08:28:45 +09:00
Thibaut Girka	59e92004b3	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: not a real conflict, upstream update too close to a glitch-soc-specific dependency	2020-06-17 17:10:15 +02:00
dependabot[bot]	b1d492f30a	Bump parallel from 1.19.1 to 1.19.2 (#14069 ) Bumps [parallel](https://github.com/grosser/parallel) from 1.19.1 to 1.19.2. - [Release notes](https://github.com/grosser/parallel/releases) - [Commits](https://github.com/grosser/parallel/compare/v1.19.1...v1.19.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-17 20:18:43 +09:00
dependabot[bot]	f5e6cbacf3	Bump capistrano from 3.14.0 to 3.14.1 (#14037 ) * Bump capistrano from 3.14.0 to 3.14.1 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.14.0 to 3.14.1. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.14.0...v3.14.1) Signed-off-by: dependabot[bot] <support@github.com> * Bump capistrano from 3.14.0 to 3.14.1 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2020-06-17 06:31:30 +02:00
mayaeh	437cdf89e0	[Security] Bump rack from 2.2.2 to 2.2.3 (#14064 )	2020-06-17 06:30:57 +02:00
dependabot[bot]	ee3e709e74	Bump sanitize from 5.2.0 to 5.2.1 (#14063 ) Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.2.0 to 5.2.1. - [Release notes](https://github.com/rgrove/sanitize/releases) - [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md) - [Commits](https://github.com/rgrove/sanitize/compare/v5.2.0...v5.2.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-17 10:15:54 +09:00
dependabot[bot]	06262afeb2	Bump parallel_tests from 2.32.0 to 3.0.0 (#14044 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.32.0 to 3.0.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.32.0...v3.0.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-16 01:00:56 +09:00
dependabot[bot]	a26f9cc0b1	Bump bundler-audit from 0.6.1 to 0.7.0.1 (#14034 ) Bumps [bundler-audit](https://github.com/postmodern/bundler-audit) from 0.6.1 to 0.7.0.1. - [Release notes](https://github.com/postmodern/bundler-audit/releases) - [Changelog](https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md) - [Commits](https://github.com/postmodern/bundler-audit/compare/v0.6.1...v0.7.0.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-16 00:57:20 +09:00
dependabot[bot]	df30002df8	Bump excon from 0.73.0 to 0.74.0 (#14046 ) Bumps [excon](https://github.com/excon/excon) from 0.73.0 to 0.74.0. - [Release notes](https://github.com/excon/excon/releases) - [Changelog](https://github.com/excon/excon/blob/master/changelog.txt) - [Commits](https://github.com/excon/excon/compare/v0.73.0...v0.74.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-15 23:41:18 +09:00
dependabot[bot]	a3a68445f1	Bump devise from 4.7.1 to 4.7.2 (#14045 ) Bumps [devise](https://github.com/plataformatec/devise) from 4.7.1 to 4.7.2. - [Release notes](https://github.com/plataformatec/devise/releases) - [Changelog](https://github.com/heartcombo/devise/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/devise/compare/v4.7.1...v4.7.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-15 23:31:04 +09:00
dependabot[bot]	36f3f874c8	Bump net-ssh from 6.0.2 to 6.1.0 (#14050 ) Bumps [net-ssh](https://github.com/net-ssh/net-ssh) from 6.0.2 to 6.1.0. - [Release notes](https://github.com/net-ssh/net-ssh/releases) - [Changelog](https://github.com/net-ssh/net-ssh/blob/master/CHANGES.txt) - [Commits](https://github.com/net-ssh/net-ssh/compare/v6.0.2...v6.1.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-15 23:28:56 +09:00
dependabot[bot]	175befd398	Bump rubocop-rails from 2.5.2 to 2.6.0 (#14047 ) Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.5.2 to 2.6.0. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.5.2...v2.6.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-15 23:26:27 +09:00
dependabot[bot]	ee86d9f235	Bump httplog from 1.4.2 to 1.4.3 (#14043 ) Bumps [httplog](https://github.com/trusche/httplog) from 1.4.2 to 1.4.3. - [Release notes](https://github.com/trusche/httplog/releases) - [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md) - [Commits](https://github.com/trusche/httplog/compare/v1.4.2...v1.4.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-15 23:22:01 +09:00
dependabot[bot]	e872197d55	Bump redis from 4.1.4 to 4.2.1 (#14038 ) Bumps [redis](https://github.com/redis/redis-rb) from 4.1.4 to 4.2.1. - [Release notes](https://github.com/redis/redis-rb/releases) - [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/redis-rb/compare/v4.1.4...v4.2.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-15 23:11:20 +09:00
dependabot[bot]	b82cd65edd	Bump ast from 2.4.0 to 2.4.1 (#14035 ) Bumps [ast](https://github.com/whitequark/ast) from 2.4.0 to 2.4.1. - [Release notes](https://github.com/whitequark/ast/releases) - [Changelog](https://github.com/whitequark/ast/blob/master/CHANGELOG.md) - [Commits](https://github.com/whitequark/ast/compare/v2.4.0...v2.4.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-15 22:46:37 +09:00
dependabot[bot]	cfb8b285d2	Bump aws-sdk-s3 from 1.67.1 to 1.68.1 (#14033 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.67.1 to 1.68.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-15 22:31:23 +09:00
Thibaut Girka	12c8ac9e14	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.	2020-06-09 10:39:20 +02:00
dependabot[bot]	5e6ec229b2	Bump rubocop from 0.85.0 to 0.85.1 (#14009 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.85.0 to 0.85.1. - [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.85.0...v0.85.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-08 15:57:07 +09:00
dependabot[bot]	f7263f436d	Bump regexp_parser from 1.7.0 to 1.7.1 (#14008 ) Bumps [regexp_parser](https://github.com/ammar/regexp_parser) from 1.7.0 to 1.7.1. - [Release notes](https://github.com/ammar/regexp_parser/releases) - [Changelog](https://github.com/ammar/regexp_parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/ammar/regexp_parser/compare/v1.7.0...v1.7.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-08 15:03:45 +09:00
dependabot[bot]	eed3964207	Bump sanitize from 5.1.0 to 5.2.0 (#14006 ) Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.1.0 to 5.2.0. - [Release notes](https://github.com/rgrove/sanitize/releases) - [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md) - [Commits](https://github.com/rgrove/sanitize/compare/v5.1.0...v5.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-08 15:02:10 +09:00
dependabot[bot]	c89dea3ba1	Bump fog-openstack from 0.3.7 to 0.3.10 (#13996 ) Bumps [fog-openstack](https://github.com/fog/fog-openstack) from 0.3.7 to 0.3.10. - [Release notes](https://github.com/fog/fog-openstack/releases) - [Changelog](https://github.com/fog/fog-openstack/blob/master/CHANGELOG.md) - [Commits](https://github.com/fog/fog-openstack/compare/v0.3.7...v0.3.10) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-08 14:46:58 +09:00
dependabot[bot]	95af5cc91f	Bump aws-sdk-s3 from 1.66.0 to 1.67.1 (#14000 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.66.0 to 1.67.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-07 02:50:28 +09:00
dependabot[bot]	087fe5a25c	Bump aws-sdk-core from 3.96.1 to 3.98.0 (#13992 ) Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby) from 3.96.1 to 3.98.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-07 02:48:18 +09:00
dependabot[bot]	385574ae82	Bump aws-partitions from 1.322.0 to 1.325.0 (#13968 ) Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.322.0 to 1.325.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-06 06:57:01 +09:00
dependabot[bot]	28d6bc3127	Bump websocket-extensions from 0.1.4 to 0.1.5 (#13967 ) Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-ruby) from 0.1.4 to 0.1.5. - [Release notes](https://github.com/faye/websocket-extensions-ruby/releases) - [Changelog](https://github.com/faye/websocket-extensions-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/faye/websocket-extensions-ruby/compare/0.1.4...0.1.5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-06 06:56:06 +09:00
dependabot[bot]	ffa0535566	Bump i18n from 1.8.2 to 1.8.3 (#13963 ) Bumps [i18n](https://github.com/svenfuchs/i18n) from 1.8.2 to 1.8.3. - [Release notes](https://github.com/svenfuchs/i18n/releases) - [Changelog](https://github.com/ruby-i18n/i18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/svenfuchs/i18n/compare/v1.8.2...v1.8.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-06 06:49:14 +09:00
dependabot[bot]	0bedc0d3af	Bump rubocop from 0.84.0 to 0.85.0 (#13961 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.84.0 to 0.85.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.84.0...v0.85.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-06 06:47:19 +09:00
dependabot[bot]	e6e5123d9c	Bump connection_pool from 2.2.2 to 2.2.3 (#13960 ) Bumps [connection_pool](https://github.com/mperham/connection_pool) from 2.2.2 to 2.2.3. - [Release notes](https://github.com/mperham/connection_pool/releases) - [Changelog](https://github.com/mperham/connection_pool/blob/master/Changes.md) - [Commits](https://github.com/mperham/connection_pool/compare/v2.2.2...v2.2.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-06 06:44:02 +09:00
ThibG	175fd5b8ba	Fix mastodon:setup choking on env variables containing '%' (#13940 ) Fix a regression introduced in #13928, caused by TTY::Command building shell commands by chaining string substitutions. Ditch TTY::Command and use system instead (both do shell out).	2020-06-03 20:18:52 +02:00
Eugen Rochko	5d8398c8b8	Add E2EE API (#13820 )	2020-06-02 19:24:53 +02:00
dependabot-preview[bot]	f86e70e08d	Bump faker from 2.11.0 to 2.12.0 (#13911 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.11.0 to 2.12.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.11.0...v2.12.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-06-02 04:55:20 +09:00
dependabot-preview[bot]	7f849c74c4	Bump json-ld-preloaded from 3.1.2 to 3.1.3 (#13923 ) Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases) - [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.2...3.1.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-06-02 04:50:02 +09:00
dependabot-preview[bot]	25c1a888ef	Bump tty-screen from 0.7.1 to 0.8.0 (#13915 ) Bumps [tty-screen](https://github.com/piotrmurach/tty-screen) from 0.7.1 to 0.8.0. - [Release notes](https://github.com/piotrmurach/tty-screen/releases) - [Changelog](https://github.com/piotrmurach/tty-screen/blob/master/CHANGELOG.md) - [Commits](https://github.com/piotrmurach/tty-screen/compare/v0.7.1...v0.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-06-02 04:48:00 +09:00
dependabot-preview[bot]	6b422cefae	Bump responders from 3.0.0 to 3.0.1 (#13914 ) Bumps [responders](https://github.com/heartcombo/responders) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/heartcombo/responders/releases) - [Changelog](https://github.com/heartcombo/responders/blob/master/CHANGELOG.md) - [Commits](https://github.com/heartcombo/responders/compare/v3.0.0...v3.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-06-02 04:46:09 +09:00
dependabot-preview[bot]	c1d41ea6a9	Bump aws-sigv4 from 1.1.3 to 1.1.4 (#13916 ) Bumps [aws-sigv4](https://github.com/aws/aws-sdk-ruby) from 1.1.3 to 1.1.4. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sigv4/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.1.3...1.1.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-06-02 04:38:52 +09:00
dependabot-preview[bot]	9b41525529	Bump fugit from 1.3.5 to 1.3.6 (#13918 ) Bumps [fugit](https://github.com/floraison/fugit) from 1.3.5 to 1.3.6. - [Release notes](https://github.com/floraison/fugit/releases) - [Changelog](https://github.com/floraison/fugit/blob/master/CHANGELOG.md) - [Commits](https://github.com/floraison/fugit/compare/v1.3.5...v1.3.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-06-02 04:38:29 +09:00
dependabot-preview[bot]	a0e3e20642	Bump coderay from 1.1.2 to 1.1.3 (#13921 ) Bumps [coderay](https://github.com/rubychan/coderay) from 1.1.2 to 1.1.3. - [Release notes](https://github.com/rubychan/coderay/releases) - [Changelog](https://github.com/rubychan/coderay/blob/master/Changes.textile) - [Commits](https://github.com/rubychan/coderay/compare/v1.1.2...v1.1.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-06-02 04:37:30 +09:00
dependabot-preview[bot]	b94333c167	Bump parser from 2.7.1.2 to 2.7.1.3 (#13922 ) Bumps [parser](https://github.com/whitequark/parser) from 2.7.1.2 to 2.7.1.3. - [Release notes](https://github.com/whitequark/parser/releases) - [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/whitequark/parser/compare/v2.7.1.2...v2.7.1.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-06-02 04:36:10 +09:00
dependabot-preview[bot]	0c5bf954e6	Bump browser from 4.1.0 to 4.2.0 (#13924 ) Bumps [browser](https://github.com/fnando/browser) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/fnando/browser/releases) - [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md) - [Commits](https://github.com/fnando/browser/compare/v4.1.0...v4.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-06-02 04:35:03 +09:00
dependabot-preview[bot]	8d9c12cb2f	Bump aws-partitions from 1.320.0 to 1.322.0 (#13927 ) Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.320.0 to 1.322.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-06-02 04:34:11 +09:00
Thibaut Girka	60b43050cb	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-29 19:27:21 +02:00
dependabot-preview[bot]	8bbc81c71e	[Security] Bump kaminari from 1.2.0 to 1.2.1 (#13886 ) Bumps [kaminari](https://github.com/kaminari/kaminari) from 1.2.0 to 1.2.1. This update includes a security fix. - [Release notes](https://github.com/kaminari/kaminari/releases) - [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md) - [Commits](https://github.com/kaminari/kaminari/compare/v1.2.0...v1.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-28 23:50:24 +02:00
Thibaut Girka	ef6bfaf12e	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-28 13:44:57 +02:00
dependabot-preview[bot]	63eedd6f97	Bump rack-attack from 6.3.0 to 6.3.1 (#13849 ) Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 6.3.0 to 6.3.1. - [Release notes](https://github.com/kickstarter/rack-attack/releases) - [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md) - [Commits](https://github.com/kickstarter/rack-attack/compare/v6.3.0...v6.3.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-28 12:58:23 +02:00
dependabot-preview[bot]	9efc38c62e	Bump rubocop from 0.83.0 to 0.84.0 (#13843 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.83.0 to 0.84.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.83.0...v0.84.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-25 21:57:53 +09:00
dependabot-preview[bot]	8d11d7e5a1	Bump sidekiq-unique-jobs from 6.0.21 to 6.0.22 (#13845 ) Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.21 to 6.0.22. - [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases) - [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md) - [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.21...v6.0.22) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-25 21:57:29 +09:00
dependabot-preview[bot]	406fc0ce2b	Bump aws-sdk-s3 from 1.64.0 to 1.66.0 (#13847 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.64.0 to 1.66.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.64.0...v1.66.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-25 21:56:51 +09:00
dependabot-preview[bot]	9dc05d7c61	Bump pghero from 2.4.2 to 2.5.0 (#13848 ) Bumps [pghero](https://github.com/ankane/pghero) from 2.4.2 to 2.5.0. - [Release notes](https://github.com/ankane/pghero/releases) - [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/pghero/compare/v2.4.2...v2.5.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-25 21:56:04 +09:00
dependabot-preview[bot]	10fc12a7b0	Bump rails from 5.2.4.2 to 5.2.4.3 (#13844 ) Bumps [rails](https://github.com/rails/rails) from 5.2.4.2 to 5.2.4.3. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.4.2...v5.2.4.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-25 14:02:19 +02:00
dependabot[bot]	51d8964b93	Bump puma from 4.3.3 to 4.3.5 (#13823 ) Bumps [puma](https://github.com/puma/puma) from 4.3.3 to 4.3.5. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-05-23 09:44:29 +02:00
dependabot-preview[bot]	c351ed3dba	Bump capybara from 3.32.1 to 3.32.2 (#13789 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.32.1 to 3.32.2. - [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.32.1...3.32.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-22 04:40:02 +09:00
dependabot-preview[bot]	db08fb9241	Bump aws-sdk-core from 3.95.0 to 3.96.1 (#13818 ) Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby) from 3.95.0 to 3.96.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-22 01:17:09 +09:00
dependabot-preview[bot]	a18fb61230	Bump rspec-rails from 4.0.0 to 4.0.1 (#13788 ) Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v4.0.0...v4.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-22 00:46:39 +09:00
dependabot-preview[bot]	0802a2d541	Bump brakeman from 4.8.1 to 4.8.2 (#13796 ) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.8.1 to 4.8.2. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v4.8.1...v4.8.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-22 00:41:09 +09:00
dependabot-preview[bot]	73e9adc9cc	Bump mime-types-data from 3.2020.0425 to 3.2020.0512 (#13783 ) Bumps [mime-types-data](https://github.com/mime-types/mime-types-data) from 3.2020.0425 to 3.2020.0512. - [Release notes](https://github.com/mime-types/mime-types-data/releases) - [Changelog](https://github.com/mime-types/mime-types-data/blob/master/History.md) - [Commits](https://github.com/mime-types/mime-types-data/compare/v3.2020.0425...v3.2020.0512) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-21 23:54:54 +09:00
dependabot-preview[bot]	7e14dddc2c	Bump capistrano-rails from 1.4.0 to 1.5.0 (#13794 ) Bumps [capistrano-rails](https://github.com/capistrano/rails) from 1.4.0 to 1.5.0. - [Release notes](https://github.com/capistrano/rails/releases) - [Changelog](https://github.com/capistrano/rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/capistrano/rails/compare/v1.4.0...v1.5.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-21 23:47:37 +09:00
dependabot-preview[bot]	1ec32d421d	Bump strong_migrations from 0.6.6 to 0.6.8 (#13792 ) Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.6.6 to 0.6.8. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.6.6...v0.6.8) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-21 23:38:57 +09:00
dependabot-preview[bot]	b27e8d78b4	Bump minitest from 5.14.0 to 5.14.1 (#13793 ) Bumps [minitest](https://github.com/seattlerb/minitest) from 5.14.0 to 5.14.1. - [Release notes](https://github.com/seattlerb/minitest/releases) - [Changelog](https://github.com/seattlerb/minitest/blob/master/History.rdoc) - [Commits](https://github.com/seattlerb/minitest/compare/v5.14.0...v5.14.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-21 23:36:38 +09:00
dependabot-preview[bot]	7249c6eeab	Bump better_errors from 2.7.0 to 2.7.1 (#13798 ) Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.7.0 to 2.7.1. - [Release notes](https://github.com/BetterErrors/better_errors/releases) - [Commits](https://github.com/BetterErrors/better_errors/compare/v2.7.0...v2.7.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-21 23:29:44 +09:00
dependabot-preview[bot]	e7acf2f506	Bump aws-partitions from 1.312.0 to 1.316.0 (#13804 ) Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.312.0 to 1.316.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-21 23:16:38 +09:00
dependabot-preview[bot]	a16bede563	Bump rubocop from 0.82.0 to 0.83.0 (#13806 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.82.0 to 0.83.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.82.0...v0.83.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-21 23:14:05 +09:00
Thibaut Girka	27b5143dc4	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-20 18:22:42 +02:00
dependabot-preview[bot]	50524d1327	Bump elasticsearch from 7.6.0 to 7.7.0 (#13784 ) Bumps [elasticsearch](https://github.com/elastic/elasticsearch-ruby) from 7.6.0 to 7.7.0. - [Release notes](https://github.com/elastic/elasticsearch-ruby/releases) - [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch-ruby/compare/v7.6.0...7.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-20 14:04:37 +02:00
Thibaut Girka	3baacf6993	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-13 22:11:49 +02:00
dependabot-preview[bot]	78202e9138	Bump doorkeeper from 5.3.3 to 5.4.0 (#13733 ) * Bump doorkeeper from 5.3.3 to 5.4.0 Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.3.3 to 5.4.0. - [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases) - [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md) - [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.3.3...v5.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Fix tests * Fix use of Doorkeeper::AccessToken.find_or_create_for * Fix tests? Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Thibaut Girka <thib@sitedethib.com>	2020-05-12 15:25:33 +02:00
dependabot-preview[bot]	4939eb40b3	Bump public_suffix from 4.0.4 to 4.0.5 (#13736 ) Bumps [public_suffix](https://github.com/weppos/publicsuffix-ruby) from 4.0.4 to 4.0.5. - [Release notes](https://github.com/weppos/publicsuffix-ruby/releases) - [Changelog](https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/weppos/publicsuffix-ruby/compare/v4.0.4...v4.0.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-12 01:10:24 +09:00
dependabot-preview[bot]	7e97ef1eb0	Bump raabro from 1.1.6 to 1.3.1 (#13738 ) Bumps [raabro](https://github.com/floraison/raabro) from 1.1.6 to 1.3.1. - [Release notes](https://github.com/floraison/raabro/releases) - [Changelog](https://github.com/floraison/raabro/blob/master/CHANGELOG.md) - [Commits](https://github.com/floraison/raabro/compare/v1.1.6...v1.3.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-12 01:10:02 +09:00
dependabot-preview[bot]	989f67c52b	Bump browser from 4.0.0 to 4.1.0 (#13737 ) Bumps [browser](https://github.com/fnando/browser) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/fnando/browser/releases) - [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md) - [Commits](https://github.com/fnando/browser/compare/v4.0.0...v4.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-12 00:57:21 +09:00
dependabot-preview[bot]	7f1d5fc0fe	Bump aws-partitions from 1.311.0 to 1.312.0 (#13735 ) Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.311.0 to 1.312.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-12 00:55:21 +09:00
dependabot-preview[bot]	fd15f8dde7	Bump strong_migrations from 0.6.5 to 0.6.6 (#13731 ) Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.6.5 to 0.6.6. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.6.5...v0.6.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-12 00:54:59 +09:00
dependabot-preview[bot]	746005b2ba	Bump rspec-expectations from 3.9.1 to 3.9.2 (#13734 ) Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.9.1 to 3.9.2. - [Release notes](https://github.com/rspec/rspec-expectations/releases) - [Changelog](https://github.com/rspec/rspec-expectations/blob/master/Changelog.md) - [Commits](https://github.com/rspec/rspec-expectations/compare/v3.9.1...v3.9.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-12 00:52:40 +09:00
dependabot-preview[bot]	d2826cdcfb	Bump pastel from 0.7.3 to 0.7.4 (#13732 ) Bumps [pastel](https://github.com/piotrmurach/pastel) from 0.7.3 to 0.7.4. - [Release notes](https://github.com/piotrmurach/pastel/releases) - [Changelog](https://github.com/piotrmurach/pastel/blob/master/CHANGELOG.md) - [Commits](https://github.com/piotrmurach/pastel/compare/v0.7.3...v0.7.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-12 00:22:35 +09:00
Thibaut Girka	4a70792b4a	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.	2020-05-10 16:19:56 +02:00
dependabot-preview[bot]	66fa9f0a04	Bump mimemagic from 0.3.4 to 0.3.5 (#13654 ) Bumps [mimemagic](https://github.com/minad/mimemagic) from 0.3.4 to 0.3.5. - [Release notes](https://github.com/minad/mimemagic/releases) - [Changelog](https://github.com/minad/mimemagic/blob/master/CHANGELOG.md) - [Commits](https://github.com/minad/mimemagic/compare/v0.3.4...v0.3.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 21:37:14 +02:00
dependabot-preview[bot]	ad9c862bb1	Bump capistrano from 3.13.0 to 3.14.0 (#13624 ) * Bump capistrano from 3.13.0 to 3.14.0 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.13.0 to 3.14.0. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.13.0...v3.14.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Update deploy.rb Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2020-05-08 21:29:03 +02:00
dependabot-preview[bot]	043255a45e	Bump rubocop from 0.79.0 to 0.82.0 (#13677 ) * Bump rubocop from 0.79.0 to 0.82.0 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.79.0 to 0.82.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.79.0...v0.82.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Update .codeclimate.yml Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2020-05-08 20:24:26 +02:00
dependabot-preview[bot]	26e8deec74	Bump net-scp from 2.0.0 to 3.0.0 (#13601 ) Bumps [net-scp](https://github.com/net-ssh/net-scp) from 2.0.0 to 3.0.0. - [Release notes](https://github.com/net-ssh/net-scp/releases) - [Changelog](https://github.com/net-ssh/net-scp/blob/master/CHANGES.txt) - [Commits](https://github.com/net-ssh/net-scp/compare/v2.0.0...v3.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:53:11 +02:00
dependabot-preview[bot]	c38c13b204	Bump pry-byebug from 3.8.0 to 3.9.0 (#13653 ) Bumps [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug) from 3.8.0 to 3.9.0. - [Release notes](https://github.com/deivid-rodriguez/pry-byebug/releases) - [Changelog](https://github.com/deivid-rodriguez/pry-byebug/blob/master/CHANGELOG.md) - [Commits](https://github.com/deivid-rodriguez/pry-byebug/compare/v3.8.0...v3.9.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:52:57 +02:00
dependabot-preview[bot]	96cdc9fa38	Bump parser from 2.7.1.1 to 2.7.1.2 (#13618 ) Bumps [parser](https://github.com/whitequark/parser) from 2.7.1.1 to 2.7.1.2. - [Release notes](https://github.com/whitequark/parser/releases) - [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/whitequark/parser/compare/v2.7.1.1...v2.7.1.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:52:18 +02:00
dependabot-preview[bot]	427a635df9	Bump capybara from 3.31.0 to 3.32.1 (#13641 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.31.0 to 3.32.1. - [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.31.0...3.32.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:51:49 +02:00
dependabot-preview[bot]	c6c83df344	Bump fugit from 1.3.3 to 1.3.5 (#13634 ) Bumps [fugit](https://github.com/floraison/fugit) from 1.3.3 to 1.3.5. - [Release notes](https://github.com/floraison/fugit/releases) - [Changelog](https://github.com/floraison/fugit/blob/master/CHANGELOG.md) - [Commits](https://github.com/floraison/fugit/compare/v1.3.3...v1.3.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:51:36 +02:00
dependabot-preview[bot]	228518214a	Bump byebug from 11.1.1 to 11.1.3 (#13625 ) Bumps [byebug](https://github.com/deivid-rodriguez/byebug) from 11.1.1 to 11.1.3. - [Release notes](https://github.com/deivid-rodriguez/byebug/releases) - [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md) - [Commits](https://github.com/deivid-rodriguez/byebug/compare/v11.1.1...v11.1.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:50:57 +02:00
dependabot-preview[bot]	a513124f78	Bump tzinfo-data from 1.2019.3 to 1.2020.1 (#13645 ) Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2019.3 to 1.2020.1. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2019.3...v1.2020.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:50:36 +02:00
dependabot-preview[bot]	33bfb8539e	Bump launchy from 2.4.3 to 2.5.0 (#13628 ) Bumps [launchy](https://github.com/copiousfreetime/launchy) from 2.4.3 to 2.5.0. - [Release notes](https://github.com/copiousfreetime/launchy/releases) - [Changelog](https://github.com/copiousfreetime/launchy/blob/master/README.md) - [Commits](https://github.com/copiousfreetime/launchy/compare/v2.4.3...v2.5.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:50:15 +02:00
dependabot-preview[bot]	d257d29d78	Bump pry from 0.12.2 to 0.13.1 (#13626 ) Bumps [pry](https://github.com/pry/pry) from 0.12.2 to 0.13.1. - [Release notes](https://github.com/pry/pry/releases) - [Changelog](https://github.com/pry/pry/blob/master/CHANGELOG.md) - [Commits](https://github.com/pry/pry/compare/v0.12.2...v0.13.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:48:48 +02:00
dependabot-preview[bot]	dc0a845b5e	Bump better_errors from 2.6.0 to 2.7.0 (#13663 ) Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.6.0 to 2.7.0. - [Release notes](https://github.com/BetterErrors/better_errors/releases) - [Commits](https://github.com/BetterErrors/better_errors/compare/v2.6.0...v2.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:48:12 +02:00
dependabot-preview[bot]	d579828eea	Bump rspec-core from 3.9.1 to 3.9.2 (#13602 ) Bumps [rspec-core](https://github.com/rspec/rspec-core) from 3.9.1 to 3.9.2. - [Release notes](https://github.com/rspec/rspec-core/releases) - [Changelog](https://github.com/rspec/rspec-core/blob/master/Changelog.md) - [Commits](https://github.com/rspec/rspec-core/compare/v3.9.1...v3.9.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:47:50 +02:00
dependabot-preview[bot]	6ad0f963b3	Bump redis-activesupport from 5.0.4 to 5.2.0 (#13599 ) Bumps [redis-activesupport](http://redis-store.org/redis-activesupport) from 5.0.4 to 5.2.0. Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:46:44 +02:00
dependabot-preview[bot]	6bb4571232	Bump aws-sdk-s3 from 1.63.0 to 1.64.0 (#13675 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.63.0 to 1.64.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.63.0...v1.64.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:45:34 +02:00
dependabot-preview[bot]	e437ca4268	Bump sidekiq from 6.0.4 to 6.0.7 (#13630 ) Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.0.4 to 6.0.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/v6.0.4...v6.0.7) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:43:26 +02:00
dependabot-preview[bot]	0d326807ad	Bump json-ld from 3.1.3 to 3.1.4 (#13661 ) Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/ruby-rdf/json-ld/releases) - [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.3...3.1.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:42:34 +02:00
dependabot-preview[bot]	05316f8a77	Bump jwt from 2.1.0 to 2.2.1 (#13639 ) Bumps [jwt](https://github.com/jwt/ruby-jwt) from 2.1.0 to 2.2.1. - [Release notes](https://github.com/jwt/ruby-jwt/releases) - [Changelog](https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md) - [Commits](https://github.com/jwt/ruby-jwt/compare/v2.1.0...v2.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:42:19 +02:00
dependabot-preview[bot]	b8eae24b2e	Bump http from 4.3.0 to 4.4.1 (#13598 ) Bumps [http](https://github.com/httprb/http) from 4.3.0 to 4.4.1. - [Release notes](https://github.com/httprb/http/releases) - [Changelog](https://github.com/httprb/http/blob/master/CHANGES.md) - [Commits](https://github.com/httprb/http/compare/v4.3.0...v4.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:42:12 +02:00
dependabot-preview[bot]	eb0a323a4b	Bump webpacker from 4.2.2 to 5.1.1 (#13631 ) Bumps [webpacker](https://github.com/rails/webpacker) from 4.2.2 to 5.1.1. - [Release notes](https://github.com/rails/webpacker/releases) - [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/webpacker/compare/v4.2.2...v5.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 17:52:54 +02:00
dependabot-preview[bot]	054b8d75c2	Bump redis from 4.1.3 to 4.1.4 (#13636 ) Bumps [redis](https://github.com/redis/redis-rb) from 4.1.3 to 4.1.4. - [Release notes](https://github.com/redis/redis-rb/releases) - [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/redis-rb/compare/v4.1.3...v4.1.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 17:45:22 +02:00
dependabot-preview[bot]	2b956c1218	Bump rack-attack from 6.2.2 to 6.3.0 (#13657 ) Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 6.2.2 to 6.3.0. - [Release notes](https://github.com/kickstarter/rack-attack/releases) - [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md) - [Commits](https://github.com/kickstarter/rack-attack/compare/v6.2.2...v6.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 17:44:24 +02:00
dependabot-preview[bot]	174eed7bec	Bump strong_migrations from 0.6.2 to 0.6.5 (#13649 ) Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.6.2 to 0.6.5. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.6.2...v0.6.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 17:44:00 +02:00
dependabot-preview[bot]	9cabc9c5d2	Bump brakeman from 4.8.0 to 4.8.1 (#13652 ) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.8.0 to 4.8.1. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v4.8.0...v4.8.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 17:42:54 +02:00
dependabot-preview[bot]	b964fd3df6	Bump premailer-rails from 1.10.3 to 1.11.1 (#13620 ) Bumps [premailer-rails](https://github.com/fphilipe/premailer-rails) from 1.10.3 to 1.11.1. - [Release notes](https://github.com/fphilipe/premailer-rails/releases) - [Changelog](https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/fphilipe/premailer-rails/compare/v1.10.3...v1.11.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 17:42:05 +02:00
dependabot-preview[bot]	1bef85ffc9	Bump doorkeeper from 5.3.2 to 5.3.3 (#13673 ) Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.3.2 to 5.3.3. - [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases) - [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md) - [Commits](https://github.com/doorkeeper-gem/doorkeeper/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-07 22:30:56 +02:00
dependabot-preview[bot]	2902138336	Bump pghero from 2.4.1 to 2.4.2 (#13603 ) Bumps [pghero](https://github.com/ankane/pghero) from 2.4.1 to 2.4.2. - [Release notes](https://github.com/ankane/pghero/releases) - [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/pghero/compare/v2.4.1...v2.4.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-07 20:29:15 +02:00
dependabot-preview[bot]	51dad928c6	[Security] Bump doorkeeper from 5.3.1 to 5.3.2 (#13613 ) Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.3.1 to 5.3.2. This update includes a security fix. - [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases) - [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md) - [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v.5.3.1...v5.3.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-07 20:16:15 +02:00
dependabot-preview[bot]	f51c547407	Bump kaminari from 1.1.1 to 1.2.0 (#13596 ) Bumps [kaminari](https://github.com/kaminari/kaminari) from 1.1.1 to 1.2.0. - [Release notes](https://github.com/kaminari/kaminari/releases) - [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md) - [Commits](https://github.com/kaminari/kaminari/compare/v1.1.1...v1.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-04 13:53:42 +02:00
Thibaut Girka	a22e6a3683	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/statuses_controller.rb`: Upstream disabled the embed controller for reblogs. Not a real conflict, but glitch-soc has an extra line to deal with its theming system. Ported upstream changes. - `app/javascript/packs/public.js`: Upstream made changes to get rid of most inline CSS, this changes javascript for public pages, which in glitch are split between different files. Ported those changes. - `app/models/status.rb`: Upstream changed the block check in `Status#permitted_for` to include domain-block checks. Not a real conflict with glitch-soc, but our scope is slightly different, as our scope for unauthenticated access do not include instance-local toots. Ported upstream changes. - `app/serializers/rest/instance_serializer.rb`: Not a real conflict, upstream added a new field to the instance serializer, the conflict is one line above since we added more of that. Ported upstream changes. - `app/views/settings/profiles/show.html.haml`: Upstream got rid of most inline CSS and moved hidden elements to data attributes in the process, in fields were we have different values. Ported upstream changes while keeping our glitch-specific values. - `app/views/statuses/_simple_status.html.haml`: Upstream got rid of inline CSS on an HAML line we treat differently, stripping empty text nodes. Ported upstream changes to the style attribute, keeping the empty text node stripping behavior.	2020-05-03 21:23:49 +02:00
Eugen Rochko	60408fa3ef	Change CircleCI test output (#13587 )	2020-05-01 20:19:01 +02:00
dependabot-preview[bot]	432c40c516	Bump parslet from 1.8.2 to 2.0.0 (#13564 ) Bumps [parslet](https://github.com/kschiess/parslet) from 1.8.2 to 2.0.0. - [Release notes](https://github.com/kschiess/parslet/releases) - [Changelog](https://github.com/kschiess/parslet/blob/master/HISTORY.txt) - [Commits](https://github.com/kschiess/parslet/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-29 01:39:21 +09:00
dependabot-preview[bot]	8357d6b027	Bump json-ld from 3.1.2 to 3.1.3 (#13566 ) Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/ruby-rdf/json-ld/releases) - [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.2...3.1.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-29 00:30:53 +09:00
dependabot-preview[bot]	f08ba21f6f	Bump ruby-saml from 1.9.0 to 1.11.0 (#13559 ) Bumps [ruby-saml](https://github.com/onelogin/ruby-saml) from 1.9.0 to 1.11.0. - [Release notes](https://github.com/onelogin/ruby-saml/releases) - [Changelog](https://github.com/onelogin/ruby-saml/blob/master/changelog.md) - [Commits](https://github.com/onelogin/ruby-saml/compare/v1.9.0...v1.11.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-29 00:26:15 +09:00
dependabot-preview[bot]	4532593245	Bump mime-types-data from 3.2019.1009 to 3.2020.0425 (#13554 ) Bumps [mime-types-data](https://github.com/mime-types/mime-types-data) from 3.2019.1009 to 3.2020.0425. - [Release notes](https://github.com/mime-types/mime-types-data/releases) - [Changelog](https://github.com/mime-types/mime-types-data/blob/master/History.md) - [Commits](https://github.com/mime-types/mime-types-data/compare/v3.2019.1009...v3.2020.0425) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-29 00:24:52 +09:00
dependabot-preview[bot]	f094b46f3a	Bump http-form_data from 2.2.0 to 2.3.0 (#13560 ) Bumps [http-form_data](https://github.com/httprb/form_data.rb) from 2.2.0 to 2.3.0. - [Release notes](https://github.com/httprb/form_data.rb/releases) - [Changelog](https://github.com/httprb/form_data/blob/master/CHANGES.md) - [Commits](https://github.com/httprb/form_data.rb/compare/v2.2.0...v2.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-29 00:21:53 +09:00
dependabot-preview[bot]	5ed739adb1	Bump aws-sdk-s3 from 1.61.2 to 1.63.0 (#13562 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.61.2 to 1.63.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits/v1.63.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-29 00:21:33 +09:00
dependabot-preview[bot]	1145a38015	Bump aws-partitions from 1.296.0 to 1.303.0 (#13552 ) Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.296.0 to 1.303.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-29 00:15:52 +09:00
dependabot-preview[bot]	8456676206	Bump oj from 3.10.5 to 3.10.6 (#13557 ) Bumps [oj](https://github.com/ohler55/oj) from 3.10.5 to 3.10.6. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.10.5...v3.10.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-27 17:20:34 +02:00
Thibaut Girka	8b2823b7b6	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-25 15:19:32 +02:00
dependabot-preview[bot]	ff32a25ee3	Bump parser from 2.7.1.0 to 2.7.1.1 (#13508 ) Bumps [parser](https://github.com/whitequark/parser) from 2.7.1.0 to 2.7.1.1. - [Release notes](https://github.com/whitequark/parser/releases) - [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/whitequark/parser/compare/v2.7.1.0...v2.7.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-21 00:05:08 +09:00
dependabot-preview[bot]	b0f86b6d15	Bump redis-actionpack from 5.0.2 to 5.2.0 (#13510 ) Bumps [redis-actionpack](http://redis-store.org/redis-actionpack) from 5.0.2 to 5.2.0. Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-20 23:57:04 +09:00
Thibaut Girka	63dc7cfa90	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-20 16:45:40 +02:00
dependabot-preview[bot]	17014b99b6	Bump nokogumbo from 2.0.1 to 2.0.2 (#13509 ) Bumps [nokogumbo](https://github.com/rubys/nokogumbo) from 2.0.1 to 2.0.2. - [Release notes](https://github.com/rubys/nokogumbo/releases) - [Changelog](https://github.com/rubys/nokogumbo/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubys/nokogumbo/compare/v2.0.1...v2.0.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-20 23:33:55 +09:00
dependabot-preview[bot]	2ea8dd564d	Bump excon from 0.71.0 to 0.73.0 (#13507 ) Bumps [excon](https://github.com/excon/excon) from 0.71.0 to 0.73.0. - [Release notes](https://github.com/excon/excon/releases) - [Changelog](https://github.com/excon/excon/blob/master/changelog.txt) - [Commits](https://github.com/excon/excon/compare/v0.71.0...v0.73.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-20 23:24:35 +09:00
dependabot-preview[bot]	4c793ff4fa	Bump redis-rack from 2.0.4 to 2.1.2 (#13512 ) Bumps [redis-rack](http://redis-store.org/redis-rack) from 2.0.4 to 2.1.2. Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-20 23:05:09 +09:00
dependabot-preview[bot]	803ac9aa7d	Bump rqrcode_core from 0.1.1 to 0.1.2 (#13506 ) Bumps [rqrcode_core](https://github.com/whomwah/rqrcode_core) from 0.1.1 to 0.1.2. - [Release notes](https://github.com/whomwah/rqrcode_core/releases) - [Commits](https://github.com/whomwah/rqrcode_core/commits/v0.1.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-20 22:29:14 +09:00
dependabot-preview[bot]	887c44ab27	Bump aws-sigv4 from 1.1.1 to 1.1.2 (#13513 ) Bumps [aws-sigv4](https://github.com/aws/aws-sdk-ruby) from 1.1.1 to 1.1.2. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sigv4/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.1.1...1.1.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-20 22:24:40 +09:00
Thibaut Girka	66ad30db48	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `package.json`: No real conflict, upstream updated a dependency which is textually adjacent to a glitch-soc-specific dependency. Updated it. - `yarn.lock`: No real conflict, upstream updated a dependency which is textually adjacent to a glitch-soc-specific dependency. Updated it.	2020-04-15 17:07:49 +02:00
dependabot-preview[bot]	516bdc66ba	Bump regexp_parser from 1.6.0 to 1.7.0 (#13460 ) Bumps [regexp_parser](https://github.com/ammar/regexp_parser) from 1.6.0 to 1.7.0. - [Release notes](https://github.com/ammar/regexp_parser/releases) - [Changelog](https://github.com/ammar/regexp_parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/ammar/regexp_parser/compare/v1.6.0...v1.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-13 23:40:22 +09:00
dependabot-preview[bot]	1170073a67	Bump rubocop-rails from 2.4.2 to 2.5.2 (#13459 ) Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.4.2 to 2.5.2. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.2...v2.5.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-13 23:36:57 +09:00
dependabot-preview[bot]	00df65df77	Bump capistrano from 3.12.1 to 3.13.0 (#13455 ) Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.12.1 to 3.13.0. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.12.1...v3.13.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-13 23:33:53 +09:00
dependabot-preview[bot]	bf421bbc65	Bump elasticsearch from 7.5.0 to 7.6.0 (#13458 ) Bumps [elasticsearch](https://github.com/elasticsearch/elasticsearch-ruby) from 7.5.0 to 7.6.0. - [Release notes](https://github.com/elasticsearch/elasticsearch-ruby/releases) - [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/v7.6.0/CHANGELOG.md) - [Commits](https://github.com/elasticsearch/elasticsearch-ruby/compare/v7.5.0...v7.6.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-13 23:21:31 +09:00
dependabot-preview[bot]	d80a7366e4	Bump fabrication from 2.21.0 to 2.21.1 (#13453 ) Bumps [fabrication](https://github.com/paulelliott/fabrication) from 2.21.0 to 2.21.1. - [Release notes](https://github.com/paulelliott/fabrication/releases) - [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown) - [Commits](https://github.com/paulelliott/fabrication/compare/2.21.0...2.21.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-13 23:16:40 +09:00
dependabot-preview[bot]	16443975f5	Bump aws-sdk-s3 from 1.61.1 to 1.61.2 (#13456 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.61.1 to 1.61.2. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-13 23:16:12 +09:00
Thibaut Girka	fdd0beefa7	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `README.md`: We have a different README than upstream, discarded upstream changes and kept ours.	2020-04-12 16:50:27 +02:00
dependabot-preview[bot]	f24ee2484b	Bump capistrano-bundler from 1.3.0 to 1.6.0 (#13416 ) Bumps [capistrano-bundler](https://github.com/capistrano/bundler) from 1.3.0 to 1.6.0. - [Release notes](https://github.com/capistrano/bundler/releases) - [Changelog](https://github.com/capistrano/bundler/blob/master/CHANGELOG.md) - [Commits](https://github.com/capistrano/bundler/compare/v1.3.0...v1.6.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-10 03:34:54 +09:00
dependabot-preview[bot]	7faf5e7385	Bump elasticsearch-dsl from 0.1.8 to 0.1.9 (#13419 ) Bumps [elasticsearch-dsl](https://github.com/elasticsearch/elasticsearch-ruby) from 0.1.8 to 0.1.9. - [Release notes](https://github.com/elasticsearch/elasticsearch-ruby/releases) - [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/elasticsearch/elasticsearch-ruby/compare/v0.1.8...v0.1.9) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-10 03:33:12 +09:00
dependabot-preview[bot]	42389bda80	Bump annotate from 3.0.3 to 3.1.1 (#13417 ) Bumps [annotate](https://github.com/ctran/annotate_models) from 3.0.3 to 3.1.1. - [Release notes](https://github.com/ctran/annotate_models/releases) - [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ctran/annotate_models/compare/v3.0.3...v3.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-10 03:32:39 +09:00
dependabot-preview[bot]	59c861e815	Bump public_suffix from 4.0.3 to 4.0.4 (#13418 ) Bumps [public_suffix](https://github.com/weppos/publicsuffix-ruby) from 4.0.3 to 4.0.4. - [Release notes](https://github.com/weppos/publicsuffix-ruby/releases) - [Changelog](https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/weppos/publicsuffix-ruby/compare/4.0.3...v4.0.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-09 03:01:54 +09:00
dependabot-preview[bot]	a2e743bf98	Bump bcrypt from 3.1.12 to 3.1.13 (#13420 ) Bumps [bcrypt](https://github.com/codahale/bcrypt-ruby) from 3.1.12 to 3.1.13. - [Release notes](https://github.com/codahale/bcrypt-ruby/releases) - [Changelog](https://github.com/codahale/bcrypt-ruby/blob/master/CHANGELOG) - [Commits](https://github.com/codahale/bcrypt-ruby/compare/v3.1.12...v3.1.13) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-09 02:59:21 +09:00
dependabot-preview[bot]	7674e9ad12	Bump loofah from 2.4.0 to 2.5.0 (#13422 ) Bumps [loofah](https://github.com/flavorjones/loofah) from 2.4.0 to 2.5.0. - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md) - [Commits](https://github.com/flavorjones/loofah/compare/v2.4.0...v2.5.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-09 02:58:12 +09:00
Thibaut Girka	9101254d0a	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/javascript/packs/public.js`: Upstream modified code that we split between multiple files due to glitch-soc's theming system. Ported those changes.	2020-04-05 18:32:06 +02:00
Eugen Rochko	5c2e63acd5	Bump rails from 5.2.4.1 to 5.2.4.2 and kind-of from 6.0.2 to 6.0.3 (#13387 ) * Bump rails from 5.2.4.1 to 5.2.4.2 * Bump kind-of from 6.0.2 to 6.0.3	2020-04-04 23:24:59 +02:00
Thibaut Girka	f3eff922a3	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `app/validators/poll_validator.rb`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `config/initializers/content_security_policy.rb`: Upstream added a rule, the way we compute ours is different, but that added rule has been ported. - `package.json`: No real conflict, dependency update. Performed the same update. - `yarn.lock`: No real conflict, dependency update. Performed the same update.	2020-04-02 20:32:00 +02:00
dependabot-preview[bot]	69558d2fe5	Bump rspec-rails from 3.9.1 to 4.0.0 (#13364 ) Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.9.1 to 4.0.0. - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.1...v4.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-02 18:54:41 +02:00
dependabot-preview[bot]	47ab0bd3e4	Bump json-ld from 3.1.1 to 3.1.2 (#13368 ) Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/ruby-rdf/json-ld/releases) - [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.1...3.1.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-01 10:05:33 +09:00
dependabot-preview[bot]	64980ed8ed	Bump json-ld-preloaded from 3.1.1 to 3.1.2 (#13365 ) Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases) - [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.1...3.1.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-01 10:05:26 +09:00
dependabot-preview[bot]	12f6d41284	Bump bootsnap from 1.4.5 to 1.4.6 (#13369 ) Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.5 to 1.4.6. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.5...v1.4.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-01 10:02:35 +09:00
dependabot-preview[bot]	77772baf34	Bump tty-prompt from 0.20.0 to 0.21.0 (#13366 ) Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.20.0 to 0.21.0. - [Release notes](https://github.com/piotrmurach/tty-prompt/releases) - [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md) - [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.20.0...v0.21.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-01 10:02:24 +09:00
dependabot-preview[bot]	66e82e9506	Bump faker from 2.10.1 to 2.11.0 (#13363 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.10.1 to 2.11.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/commits/v2.11.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-01 10:01:50 +09:00
dependabot-preview[bot]	662b5874c9	Bump sidekiq-unique-jobs from 6.0.20 to 6.0.21 (#13367 ) Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.20 to 6.0.21. - [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases) - [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md) - [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.20...v6.0.21) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-01 09:50:25 +09:00
dependabot-preview[bot]	bff1bd5447	Bump concurrent-ruby from 1.1.5 to 1.1.6 (#13346 ) Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.1.5 to 1.1.6. - [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases) - [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.5...v1.1.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-31 22:09:14 +09:00
dependabot-preview[bot]	caabc0ee76	Bump parallel_tests from 2.30.1 to 2.32.0 (#13341 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.30.1 to 2.32.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.30.1...v2.32.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-31 12:44:33 +02:00
dependabot-preview[bot]	a37ff2bd8b	Bump better_errors from 2.5.1 to 2.6.0 (#13340 ) Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.5.1 to 2.6.0. - [Release notes](https://github.com/BetterErrors/better_errors/releases) - [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.1...v2.6.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-31 12:42:44 +02:00
dependabot-preview[bot]	1bcf466fb1	Bump ox from 2.12.1 to 2.13.2 (#13342 ) Bumps [ox](https://github.com/ohler55/ox) from 2.12.1 to 2.13.2. - [Release notes](https://github.com/ohler55/ox/releases) - [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/ox/compare/v2.12.1...v2.13.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-31 12:42:17 +02:00
dependabot-preview[bot]	a2934af2e3	Bump iso-639 from 0.2.8 to 0.3.5 (#13343 ) Bumps [iso-639](https://github.com/xwmx/iso-639) from 0.2.8 to 0.3.5. - [Release notes](https://github.com/xwmx/iso-639/releases) - [Commits](https://github.com/xwmx/iso-639/compare/0.2.8...0.3.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-31 12:41:55 +02:00
dependabot-preview[bot]	cc271e99dc	Bump oj from 3.10.3 to 3.10.5 (#13345 ) Bumps [oj](https://github.com/ohler55/oj) from 3.10.3 to 3.10.5. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.10.3...v3.10.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-31 12:40:54 +02:00
dependabot-preview[bot]	b43731c69c	Bump pg from 1.2.2 to 1.2.3 (#13344 ) Bumps [pg](https://github.com/ged/ruby-pg) from 1.2.2 to 1.2.3. - [Release notes](https://github.com/ged/ruby-pg/releases) - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc) - [Commits](https://github.com/ged/ruby-pg/compare/v1.2.2...v1.2.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-31 12:40:33 +02:00
dependabot-preview[bot]	bf1919e44a	Bump brakeman from 4.7.2 to 4.8.0 (#13309 ) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.7.2 to 4.8.0. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v4.7.2...v4.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-27 22:35:49 +01:00
Thibaut Girka	7b435fd9bf	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/services/post_status_service.rb`: CW/sensitive logic fixed upstream, but different in glitch-soc. Ported the changes accordingly.	2020-03-27 21:54:44 +01:00
dependabot-preview[bot]	c1a82d9538	Bump aws-sdk-s3 from 1.60.1 to 1.61.1 (#13306 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.60.1 to 1.61.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-25 22:49:27 +01:00
dependabot-preview[bot]	3d7264a94e	Bump discard from 1.1.0 to 1.2.0 (#13308 ) Bumps [discard](https://github.com/jhawthorn/discard) from 1.1.0 to 1.2.0. - [Release notes](https://github.com/jhawthorn/discard/releases) - [Changelog](https://github.com/jhawthorn/discard/blob/master/CHANGELOG.md) - [Commits](https://github.com/jhawthorn/discard/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-25 22:48:52 +01:00
dependabot-preview[bot]	cf39f4c4a5	Bump rspec-rails from 3.9.0 to 3.9.1 (#13305 ) Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.9.0 to 3.9.1. - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.0...v3.9.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-25 22:48:21 +01:00
dependabot-preview[bot]	4b811ab4d3	Bump simplecov from 0.18.2 to 0.18.5 (#13310 ) Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.18.2 to 0.18.5. - [Release notes](https://github.com/colszowka/simplecov/releases) - [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md) - [Commits](https://github.com/colszowka/simplecov/compare/v0.18.2...v0.18.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-25 22:47:35 +01:00
dependabot-preview[bot]	09162411fc	Bump i18n-tasks from 0.9.30 to 0.9.31 (#13304 ) Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.30 to 0.9.31. - [Release notes](https://github.com/glebm/i18n-tasks/releases) - [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md) - [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.30...v0.9.31) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-25 22:46:39 +01:00
dependabot-preview[bot]	eeb4aa5f74	Bump browser from 3.0.3 to 4.0.0 (#13307 ) Bumps [browser](https://github.com/fnando/browser) from 3.0.3 to 4.0.0. - [Release notes](https://github.com/fnando/browser/releases) - [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md) - [Commits](https://github.com/fnando/browser/compare/v3.0.3...v4.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-25 22:46:23 +01:00
Thibaut Girka	9abb227250	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.	2020-03-22 16:10:44 +01:00
Yamagishi Kazutoshi	cd6d851d83	Bump sidekiq-unique-jobs from 6.0.18 to 6.0.20 (#13294 )	2020-03-22 15:25:23 +01:00
dependabot-preview[bot]	56531d646e	Bump sidekiq from 5.2.7 to 6.0.4 (#11727 ) * Bump sidekiq from 5.2.7 to 6.0.0 Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.7 to 6.0.0. - [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.7...v6.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Sidekiq::Logger.logger -> Sidekiq.logger * Drop support Ruby 2.4 * update Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2020-03-21 12:04:54 +09:00
dependabot-preview[bot]	85ff31b904	[Security] Bump omniauth from 1.9.0 to 1.9.1 (#13229 ) Bumps [omniauth](https://github.com/omniauth/omniauth) from 1.9.0 to 1.9.1. This update includes a security fix. - [Release notes](https://github.com/omniauth/omniauth/releases) - [Commits](https://github.com/omniauth/omniauth/compare/v1.9.0...v1.9.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-21 03:23:25 +01:00
dependabot-preview[bot]	c39ad4ab2f	Bump capistrano from 3.11.2 to 3.12.1 (#13264 ) * Bump capistrano from 3.11.2 to 3.12.1 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.11.2 to 3.12.1. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.11.2...v3.12.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Bump capistrano from 3.11.2 to 3.12.1 Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2020-03-18 21:48:03 +09:00
dependabot-preview[bot]	0b33d2b0f7	Bump webmock from 3.8.0 to 3.8.3 (#13265 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.8.0 to 3.8.3. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.8.0...v3.8.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-18 20:16:46 +09:00
dependabot-preview[bot]	e2b816b4da	Bump sidekiq-scheduler from 3.0.0 to 3.0.1 (#13233 ) Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases) - [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v3.0.0...v3.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-18 20:02:34 +09:00
dependabot-preview[bot]	1780f00948	Bump simple_form from 5.0.1 to 5.0.2 (#13231 ) Bumps [simple_form](https://github.com/plataformatec/simple_form) from 5.0.1 to 5.0.2. - [Release notes](https://github.com/plataformatec/simple_form/releases) - [Changelog](https://github.com/heartcombo/simple_form/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/simple_form/compare/v5.0.1...v5.0.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-18 20:01:35 +09:00
dependabot-preview[bot]	897ff630e7	Bump json-ld from 3.1.0 to 3.1.1 (#13230 ) Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/ruby-rdf/json-ld/releases) - [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.0...3.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-18 20:00:20 +09:00
dependabot-preview[bot]	7088633ae1	Bump cld3 from 3.2.6 to 3.3.0 (#13107 ) * Bump cld3 from 3.2.6 to 3.3.0 Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.6 to 3.3.0. - [Release notes](https://github.com/akihikodaki/cld3-ruby/releases) - [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.6...v3.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Fix compatibility with cld3 3.3.0 Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2020-03-09 00:12:52 +01:00
Thibaut Girka	c790ecb14d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.	2020-03-08 19:38:53 +01:00
dependabot-preview[bot]	764b89939f	Bump doorkeeper from 5.2.3 to 5.3.1 (#13144 ) Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.2.3 to 5.3.1. - [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases) - [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md) - [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.2.3...v.5.3.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-08 16:22:12 +01:00
dependabot-preview[bot]	66b014ca50	Bump json-ld-preloaded from 3.1.0 to 3.1.1 (#13143 ) Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases) - [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.0...3.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-03-02 21:48:02 +09:00
dependabot-preview[bot]	95155ecbe7	Bump oj from 3.10.1 to 3.10.3 (#13187 ) Bumps [oj](https://github.com/ohler55/oj) from 3.10.1 to 3.10.3. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.10.1...v3.10.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-03-02 21:46:56 +09:00
dependabot-preview[bot]	74c2490cdd	Bump strong_migrations from 0.5.1 to 0.6.2 (#13071 ) Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.5.1 to 0.6.2. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.5.1...v0.6.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-03-02 21:44:44 +09:00
ThibG	7d575c669e	Bump puma from 4.3.2 to 4.3.3 (#13177 ) This fixes cookies and devise authentication being broken as a result of upgrading to puma 4.3.2, see https://github.com/puma/puma/issues/2132	2020-03-01 22:25:13 +01:00
Thibaut Girka	13ef4d5fb0	Update puma from 4.3.2 to 4.3.3 Fixes #1294 This fixes cookies and devise authentication being broken as a result of upgrading to puma 4.3.2, see https://github.com/puma/puma/issues/2132	2020-03-01 20:54:02 +01:00
Thibaut Girka	b0a7cb71be	Update glitch-soc-specific dependencies - drop html2text which has been unused in a while - update redcarpet	2020-02-29 22:32:33 +01:00
Thibaut Girka	427ef4948a	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-29 12:20:54 +01:00
ThibG	5393b187c4	Fix elasticsearch-api and faraday incompatibilities (#13166 )	2020-02-29 03:05:02 +01:00
dependabot-preview[bot]	047fde18c3	[Security] Bump puma from 4.3.1 to 4.3.2 (#13167 ) Bumps [puma](https://github.com/puma/puma) from 4.3.1 to 4.3.2. This update includes a security fix. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v4.3.1...v4.3.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-29 02:57:14 +01:00
Thibaut Girka	85933bc9ff	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-25 14:28:13 +01:00
dependabot-preview[bot]	89a9eeb675	Bump rack from 2.1.2 to 2.2.2 (#13108 ) Bumps [rack](https://github.com/rack/rack) from 2.1.2 to 2.2.2. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/2.1.2...v2.2.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-20 09:24:16 +09:00
Thibaut Girka	e037002401	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-19 23:04:18 +01:00
dependabot-preview[bot]	7584342d83	Bump simplecov from 0.18.1 to 0.18.2 (#13106 ) Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.18.1 to 0.18.2. - [Release notes](https://github.com/colszowka/simplecov/releases) - [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md) - [Commits](https://github.com/colszowka/simplecov/compare/v0.18.1...v0.18.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-18 02:27:19 +09:00
dependabot-preview[bot]	fe388e5fe9	Bump pkg-config from 1.4.0 to 1.4.1 (#13105 ) Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config) from 1.4.0 to 1.4.1. - [Release notes](https://github.com/ruby-gnome/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.4.0...1.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-18 02:24:20 +09:00
dependabot-preview[bot]	28dec37101	Bump nokogiri from 1.10.7 to 1.10.8 (#13110 ) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.10.8. - [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.7...v1.10.8) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-18 02:22:43 +09:00
dependabot-preview[bot]	879b71eacb	Bump json-ld-preloaded from 3.0.6 to 3.1.0 (#12982 ) Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.0.6 to 3.1.0. - [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases) - [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.6...3.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-10 21:26:53 +09:00
dependabot-preview[bot]	b189b93c25	Bump rubocop-rails from 2.4.1 to 2.4.2 (#12984 ) Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.4.1 to 2.4.2. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.1...v2.4.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-10 21:18:07 +09:00
dependabot-preview[bot]	432e00af7c	Bump capybara from 3.30.0 to 3.31.0 (#12983 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.30.0 to 3.31.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.30.0...3.31.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-10 20:51:14 +09:00
dependabot-preview[bot]	925159abf0	Bump simplecov from 0.17.1 to 0.18.1 (#13027 ) Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.17.1 to 0.18.1. - [Release notes](https://github.com/colszowka/simplecov/releases) - [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md) - [Commits](https://github.com/colszowka/simplecov/compare/v0.17.1...v0.18.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-10 20:46:25 +09:00
dependabot-preview[bot]	dc8d57d092	Bump pry-byebug from 3.7.0 to 3.8.0 (#12985 ) Bumps [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug) from 3.7.0 to 3.8.0. - [Release notes](https://github.com/deivid-rodriguez/pry-byebug/releases) - [Changelog](https://github.com/deivid-rodriguez/pry-byebug/blob/master/CHANGELOG.md) - [Commits](https://github.com/deivid-rodriguez/pry-byebug/compare/v3.7.0...v3.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-10 20:46:05 +09:00
dependabot-preview[bot]	170e8e0725	Bump letter_opener_web from 1.3.4 to 1.4.0 (#13028 ) Bumps [letter_opener_web](https://github.com/fgrehm/letter_opener_web) from 1.3.4 to 1.4.0. - [Release notes](https://github.com/fgrehm/letter_opener_web/releases) - [Changelog](https://github.com/fgrehm/letter_opener_web/blob/master/CHANGELOG.md) - [Commits](https://github.com/fgrehm/letter_opener_web/compare/v1.3.4...v1.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-10 20:28:22 +09:00
Thibaut Girka	dae5e446fe	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `Gemfile.lock`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `app/lib/sanitize_config.rb`: Upstream added better unsupported link stripping, while we had different sanitizing configs. Took only upstream's link stripping code. - `config/locales/simple_form.pl.yml`: Strings unused in glitch-soc had been removed from glitch-soc, reintroduced them even if they are not useful, to reduce the risk of later merge conflicts.	2020-02-09 12:15:55 +01:00
mayaeh	57c42c20c0	Bump httplog from 1.4.1 to 1.4.2 (#13059 )	2020-02-09 12:05:31 +01:00
Lynne	a2cfe3daaa	update gemfile.lock for httplog 1.4.1	2020-02-09 09:49:28 +01:00
mayaeh	d9a4ce4ca2	Bump httplog from 1.4.0 to 1.4.1. (#13051 ) httplog 1.4.0 is yanked.	2020-02-08 21:39:44 +01:00
Thibaut Girka	44744e3ce1	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-28 19:15:03 +01:00
ThibG	1051de0165	Fix Gemfile.lock (#12995 ) * Use bundle install in deployment mode for Continuous Integration to catch Gemfile.lock issues * Fix deprecation warnings * Fix Gemfile.lock * More changes to catch Gemfile.lock issues	2020-01-28 18:50:44 +01:00
Shlee	720fee0685	Bump Rack from 2.0.8 to 2.1.2 (#12991 ) * Update Gemfile * Update Gemfile.lock	2020-01-28 15:23:16 +01:00
Thibaut Girka	c56a504d11	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/serializers/rest/account_serializer.rb`: Upstream added code too close to glitch-soc-specific followers-hiding code. Ported upstream changes.	2020-01-27 15:46:50 +01:00
Daigo 3 Dango	7b8e0d3477	Explicitly install rack gem (#12972 ) Pin rack version to 2.0.8. Rack-2.1.0 and 2.1.1 are known to record error below upon requests to `/sidekiq`: ``` NoMethodError - undefined method `transform_keys' for #<ActionDispatch::Request::Session:0x...> ```	2020-01-27 11:06:34 +01:00
Thibaut Girka	dc2ab6e646	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/javascript/packs/public.js`: Upstream removed an unused function in code that has been refactored a bit. Removed that function in the corresponding places.	2020-01-20 18:31:11 +01:00
dependabot-preview[bot]	06f6995860	Bump httplog from 1.3.3 to 1.4.0 (#12902 ) Bumps [httplog](https://github.com/trusche/httplog) from 1.3.3 to 1.4.0. - [Release notes](https://github.com/trusche/httplog/releases) - [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md) - [Commits](https://github.com/trusche/httplog/compare/v1.3.3...v1.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-20 23:45:10 +09:00
Thibaut Girka	45709d6987	Merge branch 'master' into glitch-soc/master Conflicts: - `README.md`: We have different README files. Discarded upstream changes. - `app/views/layouts/admin.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `app/views/layouts/embedded.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `yarn.lock`: No real conflict, glitch-specific dependency too close to an updated one. Adapted upstream change.	2020-01-20 15:00:22 +01:00
dependabot-preview[bot]	51182843d4	Bump parallel_tests from 2.30.0 to 2.30.1 (#12901 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.30.0 to 2.30.1. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.30.0...v2.30.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-20 22:08:14 +09:00
dependabot-preview[bot]	850a217784	Bump faker from 2.10.0 to 2.10.1 (#12899 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.10.0 to 2.10.1. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-20 21:37:26 +09:00
dependabot-preview[bot]	9f6785592b	Bump capistrano-rbenv from 2.1.4 to 2.1.6 (#12898 ) Bumps [capistrano-rbenv](https://github.com/capistrano/rbenv) from 2.1.4 to 2.1.6. - [Release notes](https://github.com/capistrano/rbenv/releases) - [Changelog](https://github.com/capistrano/rbenv/blob/master/CHANGELOG.md) - [Commits](https://github.com/capistrano/rbenv/compare/v2.1.4...v2.1.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-20 20:58:56 +09:00
dependabot-preview[bot]	4bdbaf809b	Bump webmock from 3.7.6 to 3.8.0 (#12900 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.7.6 to 3.8.0. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.7.6...v3.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-20 12:46:03 +01:00
dependabot-preview[bot]	4078eda312	Bump i18n-tasks from 0.9.29 to 0.9.30 (#12903 ) Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.29 to 0.9.30. - [Release notes](https://github.com/glebm/i18n-tasks/releases) - [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md) - [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.29...v0.9.30) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-20 12:45:23 +01:00
dependabot-preview[bot]	69d510a980	Bump oj from 3.10.0 to 3.10.1 (#12897 ) Bumps [oj](https://github.com/ohler55/oj) from 3.10.0 to 3.10.1. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.10.0...v3.10.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-20 12:43:52 +01:00
dependabot-preview[bot]	a31139c9f1	Bump browser from 2.7.1 to 3.0.3 (#12850 ) Bumps [browser](https://github.com/fnando/browser) from 2.7.1 to 3.0.3. - [Release notes](https://github.com/fnando/browser/releases) - [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md) - [Commits](https://github.com/fnando/browser/compare/v2.7.1...v3.0.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-15 10:24:35 +09:00
Yamagishi Kazutoshi	114ee287dc	Remove derailed_benchmarks dependency (#12861 )	2020-01-14 00:43:12 +01:00
dependabot-preview[bot]	08e540f01d	Bump pg from 1.2.1 to 1.2.2 (#12854 ) Bumps [pg](https://github.com/ged/ruby-pg) from 1.2.1 to 1.2.2. - [Release notes](https://github.com/ged/ruby-pg/releases) - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc) - [Commits](https://github.com/ged/ruby-pg/compare/v1.2.1...v1.2.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-14 03:09:31 +09:00
dependabot-preview[bot]	031a432559	Bump ox from 2.11.0 to 2.12.1 (#12853 ) Bumps [ox](https://github.com/ohler55/ox) from 2.11.0 to 2.12.1. - [Release notes](https://github.com/ohler55/ox/releases) - [Changelog](https://github.com/ohler55/ox/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/ox/compare/v2.11.0...v2.12.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-14 03:02:20 +09:00
dependabot-preview[bot]	2950b09706	Bump json-ld from e742697a0906e74e8bb777ef98137bc3955d981d to 3.1.0 (#12852 ) Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from e742697a0906e74e8bb777ef98137bc3955d981d to 3.1.0. This release includes the previously tagged commit. - [Release notes](https://github.com/ruby-rdf/json-ld/releases) - [Commits](`e742697a09`...3.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-14 03:01:43 +09:00
dependabot-preview[bot]	a0ad1f5cda	Bump rubocop from 0.78.0 to 0.79.0 (#12851 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.78.0 to 0.79.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.78.0...v0.79.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-14 02:58:56 +09:00
Thibaut Girka	83f8bf48d9	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-13 13:14:35 +01:00
dependabot-preview[bot]	d20eddc6b5	Bump rubocop-rails from 2.4.0 to 2.4.1 (#12780 ) Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.4.0 to 2.4.1. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.0...v2.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-13 02:53:57 +09:00
Thibaut Girka	980c004f06	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one	2020-01-12 15:57:34 +01:00
ThibG	24cd2126c6	Fix Ruby 2.7 support (#12831 ) - update http gem to avoid errors - update blurhash gem to avoid shared object loading error - update goldfinger gem so the http gem could be updated - update json gem to avoid warnings	2020-01-12 15:49:30 +01:00
mayaeh	c6287d5855	Remove ostatus2 gem from lockfile (#12826 )	2020-01-12 03:13:01 +01:00
mayaeh	998ba16f13	Update lockfile for #12800 (#12825 )	2020-01-11 21:49:59 +01:00
ThibG	57e2833f6a	Remove dependency on OStatus2 gem (#12822 )	2020-01-11 21:36:53 +01:00
dependabot-preview[bot]	2a5dee0f08	Bump rqrcode from 0.10.1 to 1.1.2 (#12357 ) Bumps [rqrcode](https://github.com/whomwah/rqrcode) from 0.10.1 to 1.1.2. - [Release notes](https://github.com/whomwah/rqrcode/releases) - [Commits](https://github.com/whomwah/rqrcode/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-11 19:51:04 +09:00
dependabot-preview[bot]	d1f68fb589	Bump rdf-normalize from 0.3.3 to 0.4.0 (#12785 ) Bumps [rdf-normalize](https://github.com/gkellogg/rdf-normalize) from 0.3.3 to 0.4.0. - [Release notes](https://github.com/gkellogg/rdf-normalize/releases) - [Commits](https://github.com/gkellogg/rdf-normalize/compare/0.3.3...0.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-11 07:02:16 +09:00
Thibaut Girka	578553ba05	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-07 16:28:59 +01:00
dependabot-preview[bot]	7c57c3d2ff	Bump pg from 1.2.0 to 1.2.1 (#12783 ) Bumps [pg](https://github.com/ged/ruby-pg) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/ged/ruby-pg/releases) - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc) - [Commits](https://github.com/ged/ruby-pg/compare/v1.2.0...v1.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-06 23:52:23 +09:00
dependabot-preview[bot]	746c4131ec	Bump aws-sdk-s3 from 1.59.0 to 1.60.1 (#12784 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.59.0 to 1.60.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.59.0...v1.60.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-06 23:03:05 +09:00
dependabot-preview[bot]	1d039c27f8	Bump bullet from 6.0.2 to 6.1.0 (#12782 ) Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.0.2 to 6.1.0. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/6.0.2...6.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-06 23:02:46 +09:00
dependabot-preview[bot]	974a015d95	Bump capybara from 3.29.0 to 3.30.0 (#12781 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.29.0 to 3.30.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.29.0...3.30.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-06 22:56:04 +09:00
mayaeh	bd42608be2	Update lockfile for #12758 (#12762 )	2020-01-05 02:25:07 +01:00
Thibaut Girka	01eaeab56d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.	2020-01-04 23:04:42 +01:00
Shlee	2ecc7802ca	Gemfile Updates - Others (#12761 ) * Update Gemfile.lock * Update Gemfile * Update Gemfile.lock * Update Gemfile.lock * Update Gemfile * Update Gemfile.lock	2020-01-04 22:48:57 +01:00
Shlee	882a7d3d14	Gemfile Updates - fixes warnings (#12759 ) * Update Gemfile.lock * Update Gemfile.lock * Update Gemfile	2020-01-04 22:48:18 +01:00
dependabot-preview[bot]	5c8a8bf798	Bump stackprof from 0.2.14 to 0.2.15 (#12726 ) Bumps [stackprof](https://github.com/tmm1/stackprof) from 0.2.14 to 0.2.15. - [Release notes](https://github.com/tmm1/stackprof/releases) - [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md) - [Commits](https://github.com/tmm1/stackprof/compare/v0.2.14...v0.2.15) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-31 00:23:05 +09:00
dependabot-preview[bot]	d5f93ea618	Bump pg from 1.1.4 to 1.2.0 (#12725 ) Bumps [pg](https://github.com/ged/ruby-pg) from 1.1.4 to 1.2.0. - [Release notes](https://github.com/ged/ruby-pg/releases) - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc) - [Commits](https://github.com/ged/ruby-pg/compare/v1.1.4...v1.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-31 00:21:51 +09:00
dependabot-preview[bot]	a439fc7f72	Bump redis-namespace from 1.6.0 to 1.7.0 (#12727 ) Bumps [redis-namespace](https://github.com/resque/redis-namespace) from 1.6.0 to 1.7.0. - [Release notes](https://github.com/resque/redis-namespace/releases) - [Changelog](https://github.com/resque/redis-namespace/blob/master/CHANGELOG.md) - [Commits](https://github.com/resque/redis-namespace/compare/v1.6.0...v1.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-31 00:16:45 +09:00
dependabot-preview[bot]	333009d8b1	Bump faker from 2.9.0 to 2.10.0 (#12728 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.9.0 to 2.10.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.9.0...v2.10.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-31 00:15:16 +09:00
dependabot-preview[bot]	9fe5ba82c5	Bump derailed_benchmarks from 1.4.2 to 1.4.3 (#12729 ) Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks) from 1.4.2 to 1.4.3. - [Release notes](https://github.com/schneems/derailed_benchmarks/releases) - [Changelog](https://github.com/schneems/derailed_benchmarks/blob/master/CHANGELOG.md) - [Commits](https://github.com/schneems/derailed_benchmarks/compare/v1.4.2...v1.4.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-31 00:13:25 +09:00
dependabot-preview[bot]	a80fb33be4	Bump rack-cors from 1.1.0 to 1.1.1 (#12730 ) Bumps [rack-cors](https://github.com/cyu/rack-cors) from 1.1.0 to 1.1.1. - [Release notes](https://github.com/cyu/rack-cors/releases) - [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md) - [Commits](https://github.com/cyu/rack-cors/compare/v1.1.0...v1.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-30 23:58:24 +09:00
Shlee	7a81346d55	Circleci - Upgrade to Buster Images (#12705 ) * Update config.yml * Update Gemfile.lock	2019-12-29 17:00:43 +01:00
Thibaut Girka	ad29279214	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `README.md` - `package.json`	2019-12-28 17:48:40 +01:00
dependabot-preview[bot]	ea08fc7dd2	Bump rubocop from 0.77.0 to 0.78.0 (#12677 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.77.0 to 0.78.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.77.0...v0.78.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-25 02:27:14 +09:00
dependabot-preview[bot]	ab25e9e691	Bump faker from 2.8.1 to 2.9.0 (#12680 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.8.1 to 2.9.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.8.1...v2.9.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-25 02:25:14 +09:00
dependabot-preview[bot]	d22f38bb6e	Bump strong_migrations from 0.5.0 to 0.5.1 (#12679 ) Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.5.0 to 0.5.1. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.5.0...v0.5.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-23 22:38:19 +01:00
dependabot-preview[bot]	e0c2ecb1d3	Bump rails from 5.2.4 to 5.2.4.1 (#12682 ) Bumps [rails](https://github.com/rails/rails) from 5.2.4 to 5.2.4.1. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.4...v5.2.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-23 22:37:35 +01:00
dependabot-preview[bot]	cb4831a5ac	Bump rack-attack from 6.2.1 to 6.2.2 (#12681 ) Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 6.2.1 to 6.2.2. - [Release notes](https://github.com/kickstarter/rack-attack/releases) - [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md) - [Commits](https://github.com/kickstarter/rack-attack/compare/v6.2.1...v6.2.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-23 22:36:06 +01:00
dependabot-preview[bot]	28376b319b	Bump oj from 3.9.2 to 3.10.0 (#12683 ) Bumps [oj](https://github.com/ohler55/oj) from 3.9.2 to 3.10.0. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.9.2...v3.10.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-23 22:35:04 +01:00
Thibaut Girka	ab5ff638f2	Merge branch 'master' into glitch-soc/master Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc	2019-12-19 13:52:54 +01:00
dependabot-preview[bot]	4dbf0a91b2	[Security] Bump rack from 2.0.7 to 2.0.8 (#12654 ) Bumps [rack](https://github.com/rack/rack) from 2.0.7 to 2.0.8. This update includes a security fix. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/2.0.7...2.0.8) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-19 07:21:51 +09:00
dependabot-preview[bot]	45f8968404	Bump rails from 5.2.3 to 5.2.4 (#12584 ) * Bump rails from 5.2.3 to 5.2.4 Bumps [rails](https://github.com/rails/rails) from 5.2.3 to 5.2.4. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.3...v5.2.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * sprockets ~> 3.7	2019-12-18 08:58:53 +09:00
dependabot-preview[bot]	c436367c3c	Bump json-ld-preloaded from 3.0.4 to 3.0.6 (#12361 ) Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.0.4 to 3.0.6. - [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases) - [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.4...3.0.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-18 04:04:30 +09:00
dependabot-preview[bot]	b2aeb0061a	Bump webpacker from 4.2.0 to 4.2.2 (#12632 ) Bumps [webpacker](https://github.com/rails/webpacker) from 4.2.0 to 4.2.2. - [Release notes](https://github.com/rails/webpacker/releases) - [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/webpacker/compare/v4.2.0...v4.2.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-18 03:53:15 +09:00

... 9 10 11 12 13 ...

1858 Commits