glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	124a1d3880	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
dependabot-preview[bot]	884e20c028	Bump active_model_serializers from 0.10.9 to 0.10.10 (#11311 ) * Bump active_model_serializers from 0.10.9 to 0.10.10 Bumps [active_model_serializers](https://github.com/rails-api/active_model_serializers) from 0.10.9 to 0.10.10. - [Release notes](https://github.com/rails-api/active_model_serializers/releases) - [Changelog](https://github.com/rails-api/active_model_serializers/blob/v0.10.10/CHANGELOG.md) - [Commits](https://github.com/rails-api/active_model_serializers/compare/v0.10.9...v0.10.10) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Add root option to render method	5 years ago
Thibaut Girka	579ccb0bb9	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb	5 years ago
dependabot-preview[bot]	adbe5310fa	Bump browser from 2.5.3 to 2.6.1 (#11388 ) Bumps [browser](https://github.com/fnando/browser) from 2.5.3 to 2.6.1. - [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.5.3...v2.6.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	c7f90215b1	Bump oj from 3.7.12 to 3.8.0 (#11387 ) Bumps [oj](https://github.com/ohler55/oj) from 3.7.12 to 3.8.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.7.12...v3.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	fe26f82cca	Bump rubocop from 0.72.0 to 0.73.0 (#11384 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.72.0 to 0.73.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.72.0...v0.73.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	43a34ed422	Bump premailer-rails from 1.10.2 to 1.10.3 (#11386 ) Bumps [premailer-rails](https://github.com/fphilipe/premailer-rails) from 1.10.2 to 1.10.3. - [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.2...v1.10.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	179bb74f47	Bump capybara from 3.25.0 to 3.26.0 (#11385 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.25.0 to 3.26.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.25.0...3.26.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
Thibaut Girka	eecce7e59b	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml	5 years ago
dependabot-preview[bot]	2fe3965d17	Bump strong_migrations from 0.4.0 to 0.4.1 (#11307 ) Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.4.0 to 0.4.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.4.0...v0.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	020daac19f	Bump rack-attack from 6.0.0 to 6.1.0 (#11313 ) Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 6.0.0 to 6.1.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.0.0...v6.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	b856854767	Bump rubocop-rails from 2.2.0 to 2.2.1 (#11308 ) Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.2.0 to 2.2.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.2.0...v2.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	f4ecf3c821	Bump puma from 3.12.1 to 4.0.1 (#11306 ) Bumps [puma](https://github.com/puma/puma) from 3.12.1 to 4.0.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/v3.12.1...v4.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	838b0e2e5f	Bump rubocop-rails from 2.0.1 to 2.2.0 (#11257 ) Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.0.1 to 2.2.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.0.1...v2.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	c4a6b6568f	Bump faker from 1.9.3 to 1.9.6 (#11259 ) Bumps [faker](https://github.com/stympy/faker) from 1.9.3 to 1.9.6. - [Release notes](https://github.com/stympy/faker/releases) - [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/stympy/faker/compare/v1.9.3...1.9.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	083d89b455	Bump simplecov from 0.16.1 to 0.17.0 (#11260 ) Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.16.1 to 0.17.0. - [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.16.1...v0.17.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	e821966494	Bump aws-sdk-s3 from 1.43.0 to 1.45.0 (#11262 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.43.0 to 1.45.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.43.0...v1.45.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	517123911c	Bump tzinfo-data from 1.2019.1 to 1.2019.2 (#11258 ) Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2019.1 to 1.2019.2. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2019.1...v1.2019.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
Georg Gadinger	852b0a9765	Update fuubar dependency to 2.4.1 (#11248 ) See also: thekompanee/fuubar#111	5 years ago
dependabot-preview[bot]	4338666b5f	Bump rubocop-rails from 2.0.1 to 2.2.0 (#11257 ) Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.0.1 to 2.2.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.0.1...v2.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
Eugen Rochko	f70b20a01c	Add a spam check (#11217 ) * Add a spam check * Use Nilsimsa to generate locality-sensitive hashes and compare using Levenshtein distance * Add more tests * Add exemption when the message is a reply to something that mentions the sender * Use Nilsimsa Compare Value instead of Levenshtein distance * Use MD5 for messages shorter than 10 characters * Add message to automated report, do not add non-public statuses to automated report, add trust level to accounts and make unsilencing raise the trust level to prevent repeated spam checks on that account * Expire spam check data after 3 months * Add support for local statuses, reduce expiration to 1 week, always create a report * Add content warnings to the spam check and exempt empty statuses * Change Nilsimsa threshold to 95 and make sure removed statuses are removed from the spam check * Add all matched statuses into automatic report	5 years ago
dependabot-preview[bot]	608b927f5d	Bump faker from 1.9.3 to 1.9.6 (#11259 ) Bumps [faker](https://github.com/stympy/faker) from 1.9.3 to 1.9.6. - [Release notes](https://github.com/stympy/faker/releases) - [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/stympy/faker/compare/v1.9.3...1.9.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	763d9b2ea3	Bump simplecov from 0.16.1 to 0.17.0 (#11260 ) Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.16.1 to 0.17.0. - [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.16.1...v0.17.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	08a75dad8e	Bump aws-sdk-s3 from 1.43.0 to 1.45.0 (#11262 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.43.0 to 1.45.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.43.0...v1.45.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	dabc6ca8d9	Bump tzinfo-data from 1.2019.1 to 1.2019.2 (#11258 ) Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2019.1 to 1.2019.2. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2019.1...v1.2019.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
Georg Gadinger	4b22efd3ee	Update fuubar dependency to 2.4.1 (#11248 ) See also: thekompanee/fuubar#111	5 years ago
Thibaut Girka	9866c2bfff	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Eugen Rochko	e782fcef4f	Add request pool to improve delivery performance (#10353 ) * Add request pool to improve delivery performance Fix #7909 * Ensure connection is closed when exception interrupts execution * Remove Timeout#timeout from socket connection * Fix infinite retrial loop on HTTP::ConnectionError * Close sockets on failure, reduce idle time to 90 seconds * Add MAX_REQUEST_POOL_SIZE option to limit concurrent connections to the same server * Use a shared pool size, 512 by default, to stay below open file limit * Add some tests * Add more tests * Reduce MAX_IDLE_TIME from 90 to 30 seconds, reap every 30 seconds * Use a shared pool that returns preferred connection but re-purposes other ones when needed * Fix wrong connection being returned on subsequent calls within the same thread * Reduce mutex calls on flushes from 2 to 1 and add test for reaping	5 years ago
dependabot-preview[bot]	eda8ac5298	Bump rubocop from 0.71.0 to 0.72.0 (#11229 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.71.0 to 0.72.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.71.0...v0.72.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	0b527c27c7	Bump capybara from 3.24.0 to 3.25.0 (#11225 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.24.0 to 3.25.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.24.0...3.25.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	aa1d8a4aad	Bump memory_profiler from 0.9.13 to 0.9.14 (#11227 ) Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler) from 0.9.13 to 0.9.14. - [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.13...v0.9.14) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	6dcda24de2	Bump bullet from 6.0.0 to 6.0.1 (#11228 ) Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.0.0 to 6.0.1. - [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.0...6.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
Thibaut Girka	acbed64f3d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb - config/locales/simple_form.en.yml	5 years ago
dependabot-preview[bot]	04714cfcf2	Bump derailed_benchmarks from 1.3.5 to 1.3.6 (#11171 ) Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks) from 1.3.5 to 1.3.6. - [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.3.5...v1.3.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	2516308057	Bump aws-sdk-s3 from 1.42.0 to 1.43.0 (#11172 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.42.0 to 1.43.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.42.0...v1.43.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	8601be38f3	Bump parallel_tests from 2.29.0 to 2.29.1 (#11169 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.29.0 to 2.29.1. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.29.0...v2.29.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	0412adc10e	Bump dotenv-rails from 2.7.2 to 2.7.4 (#11170 ) Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.7.2 to 2.7.4. - [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.2...v2.7.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
Thibaut Girka	22439f9ded	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/lib/sanitize_config.rb Keep our version, we support the tags upstream transforms. - package.json - yarn.lock	5 years ago
dependabot-preview[bot]	802be329d4	Bump capybara from 3.22.0 to 3.24.0 (#11100 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.22.0 to 3.24.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.22.0...3.24.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	4203ee3157	Bump ox from 2.10.1 to 2.11.0 (#11101 ) Bumps ox from 2.10.1 to 2.11.0. Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	14c6008f8b	Bump lograge from 0.11.1 to 0.11.2 (#11102 ) Bumps [lograge](https://github.com/roidrage/lograge) from 0.11.1 to 0.11.2. - [Release notes](https://github.com/roidrage/lograge/releases) - [Changelog](https://github.com/roidrage/lograge/blob/master/CHANGELOG.md) - [Commits](https://github.com/roidrage/lograge/compare/v0.11.1...v0.11.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	c108924a0c	Bump webmock from 3.5.1 to 3.6.0 (#11031 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.5.1 to 3.6.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.5.1...v3.6.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	c149b33820	Bump httplog from 1.3.0 to 1.3.1 (#11034 ) Bumps [httplog](https://github.com/trusche/httplog) from 1.3.0 to 1.3.1. - [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.0...v1.3.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	7cf310a1bf	Bump pghero from 2.2.0 to 2.2.1 (#11033 ) Bumps [pghero](https://github.com/ankane/pghero) from 2.2.0 to 2.2.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.2.0...v2.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	1348934023	Bump rubocop-rails from 2.0.0 to 2.0.1 (#11032 ) Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.0.0 to 2.0.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.0.0...v2.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	6c92ba7697	Bump aws-sdk-s3 from 1.41.0 to 1.42.0 (#11030 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.41.0 to 1.42.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.41.0...v1.42.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
Thibaut Girka	00552d2f79	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb	5 years ago
Yamagishi Kazutoshi	cb4f45ab83	require rubocop-rails in .rubocop.yml (#10974 ) * Revert "Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965)" This reverts commit `fd0a944959`. * Disable Rails/HelperInstanceVariable	5 years ago
Thibaut Girka	a76c660645	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	5 years ago
Yamagishi Kazutoshi	fd0a944959	Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965 )	5 years ago
Yamagishi Kazutoshi	8e7c0e9621	Replace from scss-lint to sass-lint (#10958 )	5 years ago
Yamagishi Kazutoshi	335bf3fb23	Use rubocop-rails (#10957 )	5 years ago
dependabot-preview[bot]	a7904ddc4b	Bump webpacker from 4.0.6 to 4.0.7 (#10948 ) Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.6 to 4.0.7. - [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.0.6...v4.0.7)	5 years ago
dependabot-preview[bot]	5a9b97b359	Bump fuubar from 2.3.2 to 2.4.0 (#10947 ) Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.3.2 to 2.4.0. - [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.3.2...releases/v2.4.0)	5 years ago
Thibaut Girka	a4e0071538	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream Conflicts: - Gemfile.lock - config/webpack/rules/css.js - package.json - yarn.lock	5 years ago
dependabot-preview[bot]	1245ffaae2	Bump webpacker from 4.0.5 to 4.0.6 (#10905 ) Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.5 to 4.0.6. - [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.0.5...v4.0.6)	5 years ago
dependabot-preview[bot]	1f26815956	Bump webpacker from 4.0.4 to 4.0.5 (#10903 ) Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.4 to 4.0.5. - [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.0.4...v4.0.5)	5 years ago
dependabot-preview[bot]	07f1e5d205	Bump redis from 4.1.1 to 4.1.2 (#10899 ) Bumps [redis](https://github.com/redis/redis-rb) from 4.1.1 to 4.1.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.1.1...v4.1.2)	5 years ago
dependabot-preview[bot]	350c80ab4a	Bump rubocop from 0.70.0 to 0.71.0 (#10901 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.70.0 to 0.71.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.70.0...v0.71.0)	5 years ago
Thibaut Girka	206d0ea6a2	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
dependabot-preview[bot]	e4697d8a07	Bump aws-sdk-s3 from 1.40.0 to 1.41.0 (#10892 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.40.0 to 1.41.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.40.0...v1.41.0)	5 years ago
dependabot-preview[bot]	32f08dd517	Bump capybara from 3.21.0 to 3.22.0 (#10893 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.21.0 to 3.22.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.21.0...3.22.0)	5 years ago
dependabot-preview[bot]	01088d554e	Bump strong_migrations from 0.3.1 to 0.4.0 (#10871 ) Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.3.1 to 0.4.0. - [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.3.1...v0.4.0)	5 years ago
dependabot-preview[bot]	845b86d0ac	Bump webpacker from 4.0.2 to 4.0.4 (#10882 ) Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.2 to 4.0.4. - [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.0.2...v4.0.4)	5 years ago
dependabot-preview[bot]	1728463220	Bump capybara from 3.20.2 to 3.21.0 (#10854 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.20.2 to 3.21.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.20.2...3.21.0)	5 years ago
dependabot-preview[bot]	797b5836d6	Bump tty-prompt from 0.18.1 to 0.19.0 (#10870 ) Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.18.1 to 0.19.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.18.1...v0.19.0)	5 years ago
Thibaut Girka	b9c5aed987	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
dependabot-preview[bot]	609677c28d	Bump ox from 2.10.0 to 2.10.1 (#10869 ) Bumps [ox](https://github.com/ohler55/ox) from 2.10.0 to 2.10.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.10.0...v2.10.1)	5 years ago
Thibaut Girka	d445d5833e	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.	5 years ago
dependabot[bot]	88029fd2ab	Bump aws-sdk-s3 from 1.39.0 to 1.40.0 (#10803 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.39.0 to 1.40.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.39.0...v1.40.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	8ad21993a8	Bump rubocop from 0.69.0 to 0.70.0 (#10802 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.69.0 to 0.70.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.69.0...v0.70.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	329286f4f9	Bump httplog from 1.2.2 to 1.3.0 (#10795 ) Bumps [httplog](https://github.com/trusche/httplog) from 1.2.2 to 1.3.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/commits/v1.3.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	cb37c92e7b	Bump lograge from 0.11.0 to 0.11.1 (#10793 ) Bumps [lograge](https://github.com/roidrage/lograge) from 0.11.0 to 0.11.1. - [Release notes](https://github.com/roidrage/lograge/releases) - [Changelog](https://github.com/roidrage/lograge/blob/master/CHANGELOG.md) - [Commits](https://github.com/roidrage/lograge/compare/v0.11.0...v0.11.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	584ab2879e	Bump capybara from 3.20.0 to 3.20.2 (#10794 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.20.0 to 3.20.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.20.0...3.20.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
Thibaut Girka	08a793cbd9	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Thibaut Girka	8313ee07f6	Add support for markdown-formatted toots	5 years ago
dependabot[bot]	893176c07c	Bump aws-sdk-s3 from 1.38.0 to 1.39.0 (#10773 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.38.0 to 1.39.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.38.0...v1.39.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	6b5543715e	Bump capybara from 3.19.1 to 3.20.0 (#10768 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.19.1 to 3.20.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.19.1...3.20.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	9b63b0df57	Bump aws-sdk-s3 from 1.36.1 to 1.38.0 (#10769 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.36.1 to 1.38.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.36.1...v1.38.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
Thibaut Girka	422dd06806	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
dependabot[bot]	82a5359072	Bump capybara from 3.18.0 to 3.19.1 (#10758 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.18.0 to 3.19.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.18.0...3.19.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	90ef9cf9b0	Bump brakeman from 4.5.0 to 4.5.1 (#10757 ) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.5.0 to 4.5.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.5.0...v4.5.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	e6f8b1ca09	Bump rubocop from 0.68.1 to 0.69.0 (#10762 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.68.1 to 0.69.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.68.1...v0.69.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
Thibaut Girka	1bf48b01e3	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system	5 years ago
dependabot[bot]	021c89c896	Bump redis from 4.1.0 to 4.1.1 (#10722 ) Bumps [redis](https://github.com/redis/redis-rb) from 4.1.0 to 4.1.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.0...v4.1.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	17394a9723	Bump parallel_tests from 2.28.0 to 2.29.0 (#10716 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.28.0 to 2.29.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.28.0...v2.29.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
Thibaut Girka	23829e09f5	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Eugen Rochko	715cb437f6	Bump blurhash from 0.1.2 to 0.1.3 (#10700 )	5 years ago
Thibaut Girka	73bc58c656	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/media_attachment.rb	5 years ago
dependabot[bot]	592ab699fe	Bump rack-attack from 5.4.2 to 6.0.0 (#10599 ) * Bump rack-attack from 5.4.2 to 6.0.0 Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 5.4.2 to 6.0.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/v5.4.2...v6.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * fix payload[:request]	5 years ago
dependabot[bot]	6b59bd7b99	Bump scss_lint from 0.57.1 to 0.58.0 (#10678 ) Bumps [scss_lint](https://github.com/sds/scss-lint) from 0.57.1 to 0.58.0. - [Release notes](https://github.com/sds/scss-lint/releases) - [Changelog](https://github.com/sds/scss-lint/blob/master/CHANGELOG.md) - [Commits](https://github.com/sds/scss-lint/compare/v0.57.1...v0.58.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	7082beda2a	Bump fabrication from 2.20.1 to 2.20.2 (#10677 ) Bumps [fabrication](https://github.com/paulelliott/fabrication) from 2.20.1 to 2.20.2. - [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.20.1...2.20.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	91f1b59c5e	Bump rubocop from 0.68.0 to 0.68.1 (#10658 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.68.0 to 0.68.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.68.0...v0.68.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	121d9220e6	Bump annotate from 2.7.4 to 2.7.5 (#10651 ) Bumps [annotate](https://github.com/ctran/annotate_models) from 2.7.4 to 2.7.5. - [Release notes](https://github.com/ctran/annotate_models/releases) - [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.rdoc) - [Commits](https://github.com/ctran/annotate_models/compare/v2.7.4...2.7.5) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	60812a2790	Bump bullet from 5.9.0 to 6.0.0 (#10635 ) Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.9.0 to 6.0.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/5.9.0...6.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	91f2acf428	Bump rubocop from 0.67.2 to 0.68.0 (#10654 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.67.2 to 0.68.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.67.2...v0.68.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
Eugen Rochko	a6d2fe7165	Add blurhash (#10630 ) * Add blurhash * Use fallback color for spoiler when blurhash missing * Federate the blurhash and accept it as long as it's at most 5x5 * Display unknown media attachments as blurhash placeholders * Improve style of embed actions and spoiler button * Change blurhash resolution from 3x3 to 4x4 * Improve dependency definitions * Fix code style issues	5 years ago
dependabot[bot]	b3d218e5a1	Bump bootsnap from 1.4.3 to 1.4.4 (#10634 ) Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.3 to 1.4.4. - [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.3...v1.4.4) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
Thibaut Girka	0f97c82eac	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
dependabot[bot]	d5d779cd34	Bump sidekiq from 5.2.6 to 5.2.7 (#10627 ) Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.6 to 5.2.7. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v5.2.6...v5.2.7) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	795f2a7c8f	Bump capybara from 3.17.0 to 3.18.0 (#10626 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.17.0 to 3.18.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.17.0...3.18.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	7ea37bbdc8	[Security] Bump nokogiri from 1.10.2 to 1.10.3 (#10620 ) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.2 to 1.10.3. This update includes security fixes. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.2...v1.10.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	907415ac08	Bump capybara from 3.16.2 to 3.17.0 (#10602 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.2 to 3.17.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.16.2...3.17.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
Thibaut Girka	6f85bb754b	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc	5 years ago
dependabot[bot]	e9cae29819	Bump aws-sdk-s3 from 1.36.0 to 1.36.1 (#10618 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.36.0 to 1.36.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.36.0...v1.36.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	824a8598ce	Bump doorkeeper from 5.0.2 to 5.1.0 (#10598 ) Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.0.2 to 5.1.0. - [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases) - [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md) - [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.2...v5.1.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	6d259cc9cd	Bump cld3 from 3.2.3 to 3.2.4 (#10617 ) Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.3 to 3.2.4. - [Release notes](https://github.com/akihikodaki/cld3-ruby/releases) - [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.3...v3.2.4) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	df02f5b148	Bump webpush from 0.3.7 to 0.3.8 (#10592 ) Bumps [webpush](https://github.com/zaru/webpush) from 0.3.7 to 0.3.8. - [Release notes](https://github.com/zaru/webpush/releases) - [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md) - [Commits](https://github.com/zaru/webpush/compare/v0.3.7...v0.3.8) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	4031cce0a5	Bump lograge from 0.10.0 to 0.11.0 (#10588 ) Bumps [lograge](https://github.com/roidrage/lograge) from 0.10.0 to 0.11.0. - [Release notes](https://github.com/roidrage/lograge/releases) - [Changelog](https://github.com/roidrage/lograge/blob/master/CHANGELOG.md) - [Commits](https://github.com/roidrage/lograge/compare/v0.10.0...v0.11.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	3673665b46	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	b3046385f3	Bump sidekiq from 5.2.5 to 5.2.6 (#10582 ) Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.5 to 5.2.6. - [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.5...v5.2.6) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	3daf6472ef	Bump sidekiq-unique-jobs from 6.0.12 to 6.0.13 (#10580 ) Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.12 to 6.0.13. - [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.12...v6.0.13) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	3115bad263	Bump oj from 3.7.11 to 3.7.12 (#10581 ) Bumps [oj](https://github.com/ohler55/oj) from 3.7.11 to 3.7.12. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.7.11...v3.7.12) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	ba45074471	Bump rubocop from 0.67.1 to 0.67.2 (#10500 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.67.1 to 0.67.2. - [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.67.1...v0.67.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	6dd6444fd3	Bump capybara from 3.16.1 to 3.16.2 (#10552 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.1 to 3.16.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.16.1...3.16.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	cde0ac1aa7	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.	6 years ago
dependabot[bot]	2c03aa4da8	Bump hamlit-rails from 0.2.2 to 0.2.3 (#10522 ) Bumps [hamlit-rails](https://github.com/mfung/hamlit-rails) from 0.2.2 to 0.2.3. - [Release notes](https://github.com/mfung/hamlit-rails/releases) - [Commits](https://github.com/mfung/hamlit-rails/compare/v0.2.2...v0.2.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	5b05a2ea9f	Bump bootsnap from 1.4.2 to 1.4.3 (#10523 ) Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.2 to 1.4.3. - [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.2...v1.4.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	5c8f9a3220	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.	6 years ago
dependabot[bot]	494f2e4729	Bump rubocop from 0.66.0 to 0.67.1 (#10475 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.66.0 to 0.67.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.66.0...v0.67.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	a835ea0e8f	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/following_accounts_controller.rb Conflicts were due to glitch-soc's theming system. - app/javascript/packs/public.js Some code has been change upstream, but it has been moved to app/javascript/core/settings.js in glitch-soc. Applied the changes there.	6 years ago
dependabot[bot]	b3726cd06d	Bump i18n-tasks from 0.9.28 to 0.9.29 (#10451 ) Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.28 to 0.9.29. - [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.28...v0.9.29) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	1aef2d60d7	Bump capybara from 3.16.0 to 3.16.1 (#10450 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.0 to 3.16.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.16.0...3.16.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	99336afaff	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	3df435ddba	Bump capybara from 3.15.0 to 3.16.0 (#10415 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.15.0 to 3.16.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.15.0...3.16.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	0117de0a01	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml	6 years ago
dependabot[bot]	db1d883202	Bump aws-sdk-s3 from 1.35.0 to 1.36.0 (#10406 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.35.0 to 1.36.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.35.0...v1.36.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	68d3c33532	Bump rails from 5.2.2.1 to 5.2.3 (#10407 ) Bumps [rails](https://github.com/rails/rails) from 5.2.2.1 to 5.2.3. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.2.1...v5.2.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	11b3d88dc8	[Security] Bump devise from 4.5.0 to 4.6.2 (#10394 ) Bumps [devise](https://github.com/plataformatec/devise) from 4.5.0 to 4.6.2. This update includes security fixes. - [Release notes](https://github.com/plataformatec/devise/releases) - [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/devise/compare/v4.5.0...v4.6.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	77718e0b98	Bump tzinfo-data from 1.2018.9 to 1.2019.1 (#10396 ) Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2018.9 to 1.2019.1. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.9...v1.2019.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	b27559d1c4	Bump bootsnap from 1.4.1 to 1.4.2 (#10395 ) Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.1 to 1.4.2. - [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.1...v1.4.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	1f70b51fff	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml	6 years ago
Thibaut Girka	e97d76632d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/admin/settings_controller.rb - app/models/form/admin_settings.rb Conflicts caused by upstream refactoring, while we have flavours and skins, with the flavour_and_skin pseudo-setting.	6 years ago
dependabot[bot]	4527b357ef	Bump makara from 0.4.0 to 0.4.1 (#10382 ) Bumps [makara]() from 0.4.0 to 0.4.1. Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	d5483234a8	Bump dotenv-rails from 2.7.1 to 2.7.2 (#10381 ) Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.7.1 to 2.7.2. - [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.1...v2.7.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	1ec7d1a391	Bump nokogiri from 1.10.1 to 1.10.2 (#10380 ) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.1 to 1.10.2. - [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.1...v1.10.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	030837582e	Bump aws-sdk-s3 from 1.34.0 to 1.35.0 (#10369 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.34.0 to 1.35.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.34.0...v1.35.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	25e08b6f91	Bump rack-cors from 1.0.2 to 1.0.3 (#10368 ) Bumps [rack-cors](https://github.com/cyu/rack-cors) from 1.0.2 to 1.0.3. - [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.0.2...v1.0.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	26972885c6	Bump memory_profiler from 0.9.12 to 0.9.13 (#10341 ) Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler) from 0.9.12 to 0.9.13. - [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.12...v0.9.13) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	8e9903f486	Bump aws-sdk-s3 from 1.33.0 to 1.34.0 (#10342 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.33.0 to 1.34.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.33.0...v1.34.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	8410fcd3a7	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	9526b0abd7	Bump puma from 3.12.0 to 3.12.1 (#10331 ) Bumps [puma](https://github.com/puma/puma) from 3.12.0 to 3.12.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/v3.12.0...v3.12.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	098c21c354	Bump oj from 3.7.10 to 3.7.11 (#10332 ) Bumps [oj](https://github.com/ohler55/oj) from 3.7.10 to 3.7.11. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.7.10...v3.7.11) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	69d4cfe90f	Bump capybara from 3.14.0 to 3.15.0 (#10330 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.14.0 to 3.15.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.14.0...3.15.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	c37bc0b268	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.	6 years ago
dependabot[bot]	506e50f8c2	Bump aws-sdk-s3 from 1.32.0 to 1.33.0 (#10319 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.32.0 to 1.33.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.32.0...v1.33.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	5389826d69	Bump rubocop from 0.65.0 to 0.66.0 (#10318 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.65.0 to 0.66.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.65.0...v0.66.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	365de06816	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/accounts_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/statuses_controller.rb All conflicts caused by the additional `use_pack` used for glitch-soc's theming system.	6 years ago
dependabot[bot]	8fc429abe9	Bump brakeman from 4.4.0 to 4.5.0 (#10309 ) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.4.0 to 4.5.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.4.0...v4.5.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	4884dec606	Bump httplog from 1.2.1 to 1.2.2 (#10311 ) Bumps [httplog](https://github.com/trusche/httplog) from 1.2.1 to 1.2.2. - [Release notes](https://github.com/trusche/httplog/releases) - [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md) - [Commits](https://github.com/trusche/httplog/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	aa34899b74	Bump pkg-config from 1.3.6 to 1.3.7 (#10310 ) Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.6 to 1.3.7. - [Release notes](https://github.com/ruby-gnome2/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.6...1.3.7) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	eed61a37ec	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up.	6 years ago
Yamagishi Kazutoshi	e0e72c90b6	Bump webpacker from 3.5.5 to 4.0.2 (#10277 ) Bumps [webpacker](https://github.com/rails/webpacker) from 3.5.5 to 4.0.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/v3.5.5...v4.0.2) Signed-off-by: dependabot[bot] <support@dependabot.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	6 years ago
dependabot[bot]	9200afd9e6	Bump aws-sdk-s3 from 1.31.0 to 1.32.0 (#10279 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.31.0 to 1.32.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/1.31.0...v1.32.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	8edfcf7b56	Bump oj from 3.7.9 to 3.7.10 (#10278 ) Bumps [oj](https://github.com/ohler55/oj) from 3.7.9 to 3.7.10. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.7.9...v3.7.10) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	741766a01d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.	6 years ago
dependabot[bot]	103278e29a	[Security] Bump rails from 5.2.2 to 5.2.2.1 (#10257 ) Bumps [rails](https://github.com/rails/rails) from 5.2.2 to 5.2.2.1. This update includes security fixes. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.2...v5.2.2.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	d86033c352	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/about_controller.rb - app/controllers/tags_controller.rb - app/views/about/show.html.haml - spec/views/about/show.html.haml_spec.rb	6 years ago
dependabot[bot]	f326de90ef	Bump active_record_query_trace from 1.6.1 to 1.6.2 (#10252 ) Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace) from 1.6.1 to 1.6.2. - [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.6.1...v1.6.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	9c76fab112	Bump concurrent-ruby from 1.1.4 to 1.1.5 (#10242 ) Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.1.4 to 1.1.5. - [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.4...v1.1.5) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	edd48921c6	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	b80943b08b	Bump aws-sdk-s3 from 1.30.1 to 1.31.0 (#10236 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.30.1 to 1.31.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/1.30.1...1.31.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	5101d1ea41	Bump pkg-config from 1.3.5 to 1.3.6 (#10235 ) Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.5 to 1.3.6. - [Release notes](https://github.com/ruby-gnome2/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.5...1.3.6) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	d8d9c9b983	Bump active_record_query_trace from 1.6 to 1.6.1 (#10237 ) Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace) from 1.6 to 1.6.1. - [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.6...v1.6.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	bed7758022	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	51faba7b59	Bump pkg-config from 1.3.4 to 1.3.5 (#10218 ) Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.4 to 1.3.5. - [Release notes](https://github.com/ruby-gnome2/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.4...1.3.5) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	d8d8c64965	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	adc68b7a2e	Bump webpush from 0.3.6 to 0.3.7 (#10205 ) Bumps [webpush](https://github.com/zaru/webpush) from 0.3.6 to 0.3.7. - [Release notes](https://github.com/zaru/webpush/releases) - [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md) - [Commits](https://github.com/zaru/webpush/compare/v0.3.6...v0.3.7) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	3ebbc1f017	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	67764e36f9	Bump active_record_query_trace from 1.5.4 to 1.6 (#10192 ) Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace) from 1.5.4 to 1.6. - [Release notes](https://github.com/brunofacca/active-record-query-trace/releases) - [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/v1.6/HISTORY.md) - [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.5.4...v1.6) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	c0b876f726	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.	6 years ago
dependabot[bot]	e084f9cb17	Bump sidekiq-unique-jobs from 6.0.11 to 6.0.12 (#10132 ) Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.11 to 6.0.12. - [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.11...v6.0.12) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	91934eeb74	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	6e16d69267	Bump capybara from 3.13.2 to 3.14.0 (#10119 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.13.2 to 3.14.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.13.2...3.14.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	b8ca907d39	Bump hamlit-rails from 0.2.1 to 0.2.2 (#10124 ) Bumps [hamlit-rails](https://github.com/mfung/hamlit-rails) from 0.2.1 to 0.2.2. - [Release notes](https://github.com/mfung/hamlit-rails/releases) - [Commits](https://github.com/mfung/hamlit-rails/compare/v0.2.1...v0.2.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	76949bc007	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - Dockerfile Took upstream version and reverted `b6d0dcc5d3`. Hopefuly it's not needed anymore. - app/controllers/api/v1/search_controller.rb The conflict was due to us raising the number of results returned. Upstream raised it further, so took it. - config/locales/de.yml Took upstream changes to theme translation strings. - config/locales/gl.yml Took upstream changes to theme translation strings. - config/locales/nl.yml Took upstream changes to theme translation strings. - config/locales/sk.yml Took upstream changes to theme translation strings.	6 years ago
dependabot[bot]	737ad494c0	Bump hamlit-rails from 0.2.0 to 0.2.1 (#10120 ) Bumps [hamlit-rails](https://github.com/mfung/hamlit-rails) from 0.2.0 to 0.2.1. - [Release notes](https://github.com/mfung/hamlit-rails/releases) - [Commits](https://github.com/mfung/hamlit-rails/compare/v0.2.0...v0.2.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	df7740b1da	Bump bootsnap from 1.4.0 to 1.4.1 (#10118 ) Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.0 to 1.4.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.4.0...v1.4.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	d98b9c940e	Bump rubocop from 0.64.0 to 0.65.0 (#10112 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.64.0 to 0.65.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.64.0...v0.65.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	764279edf7	Bump dotenv-rails from 2.6.0 to 2.7.1 (#10114 ) Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.6.0 to 2.7.1. - [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.6.0...v2.7.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	d130f21542	Bump sidekiq-unique-jobs from 6.0.9 to 6.0.11 (#10113 ) Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.9 to 6.0.11. - [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.9...v6.0.11) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	7b03dd3db9	Bump pry-byebug from 3.6.0 to 3.7.0 (#10098 ) Bumps [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug) from 3.6.0 to 3.7.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.6.0...v3.7.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Daigo 3 Dango	85c9cdaed0	Upgrade Ruby to 2.6.1 (#9956 )	6 years ago
dependabot[bot]	98c55a5116	Bump pkg-config from 1.3.3 to 1.3.4 (#10081 ) Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.3 to 1.3.4. - [Release notes](https://github.com/ruby-gnome2/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.3...1.3.4) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	ac59623c1c	Bump oj from 3.7.8 to 3.7.9 (#10082 ) Bumps [oj](https://github.com/ohler55/oj) from 3.7.8 to 3.7.9. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.7.8...v3.7.9) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	c8086b6efb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	e45f98c499	Bump better_errors from 2.5.0 to 2.5.1 (#10050 ) Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.5.0 to 2.5.1. - [Release notes](https://github.com/BetterErrors/better_errors/releases) - [Changelog](https://github.com/BetterErrors/better_errors/blob/master/CHANGELOG.md) - [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.0...v2.5.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	a4cfb5c36b	Bump faker from 1.9.2 to 1.9.3 (#10031 ) Bumps [faker](https://github.com/stympy/faker) from 1.9.2 to 1.9.3. - [Release notes](https://github.com/stympy/faker/releases) - [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/stympy/faker/compare/v1.9.2...v1.9.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	ee737fbbd3	Bump bootsnap from 1.3.2 to 1.4.0 (#10022 ) Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.3.2 to 1.4.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.3.2...v1.4.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	222b0095bb	Bump faker from 1.9.1 to 1.9.2 (#10020 ) Bumps [faker](https://github.com/stympy/faker) from 1.9.1 to 1.9.2. - [Release notes](https://github.com/stympy/faker/releases) - [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/stympy/faker/compare/v1.9.1...v1.9.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	194afac341	Bump pkg-config from 1.3.2 to 1.3.3 (#10023 ) Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.2 to 1.3.3. - [Release notes](https://github.com/ruby-gnome2/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.2...1.3.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	394cc99d66	Bump sidekiq-unique-jobs from 6.0.8 to 6.0.9 (#10019 ) Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.8 to 6.0.9. - [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.8...v6.0.9) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	de60ff3809	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	d5684d9d31	Bump active_model_serializers from 0.10.8 to 0.10.9 (#10018 ) Bumps [active_model_serializers](https://github.com/rails-api/active_model_serializers) from 0.10.8 to 0.10.9. - [Release notes](https://github.com/rails-api/active_model_serializers/releases) - [Changelog](https://github.com/rails-api/active_model_serializers/blob/v0.10.9/CHANGELOG.md) - [Commits](https://github.com/rails-api/active_model_serializers/compare/v0.10.8...v0.10.9) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	6c9870bb8e	Bump rubocop from 0.63.1 to 0.64.0 (#10006 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.63.1 to 0.64.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.63.1...v0.64.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	1c37ad108c	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.	6 years ago
dependabot[bot]	a3d1413871	Bump parallel_tests from 2.27.1 to 2.28.0 (#9985 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.27.1 to 2.28.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.27.1...v2.28.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	84c2532862	Bump microformats from 4.0.7 to 4.1.0 (#9980 ) Bumps [microformats](https://github.com/microformats/microformats-ruby) from 4.0.7 to 4.1.0. - [Release notes](https://github.com/microformats/microformats-ruby/releases) - [Commits](https://github.com/microformats/microformats-ruby/compare/v4.0.7...v4.1.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	49c71bc1a2	Bump capybara from 3.12.0 to 3.13.2 (#9935 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.12.0 to 3.13.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.12.0...3.13.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	4e8e5bdda9	Bump httplog from 1.2.0 to 1.2.1 (#9942 ) Bumps [httplog](https://github.com/trusche/httplog) from 1.2.0 to 1.2.1. - [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.2.0...v1.2.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	aaf98669a5	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - README.md Kept our version - app/javascript/mastodon/features/compose/components/compose_form.js Two changes too close to each other, took both changes	6 years ago
dependabot[bot]	293907f653	Bump rails-i18n from 5.1.2 to 5.1.3 (#9943 ) Bumps [rails-i18n](https://github.com/svenfuchs/rails-i18n) from 5.1.2 to 5.1.3. - [Release notes](https://github.com/svenfuchs/rails-i18n/releases) - [Changelog](https://github.com/svenfuchs/rails-i18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/svenfuchs/rails-i18n/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	a9c3e77e81	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	3dd3b199e8	Bump oj from 3.7.7 to 3.7.8 (#9900 ) Bumps [oj](https://github.com/ohler55/oj) from 3.7.7 to 3.7.8. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.7.7...v3.7.8) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	3ee6c5cdba	Bump rubocop from 0.63.0 to 0.63.1 (#9899 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.63.0 to 0.63.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.63.0...v0.63.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	5fcef3efa5	Bump json-ld-preloaded from 3.0.0 to 3.0.2 (#9891 ) Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.0.0 to 3.0.2. - [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases) - [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.0...3.0.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	b41575c96f	Bump pundit from 2.0.0 to 2.0.1 (#9890 ) Bumps [pundit](https://github.com/varvet/pundit) from 2.0.0 to 2.0.1. - [Release notes](https://github.com/varvet/pundit/releases) - [Changelog](https://github.com/varvet/pundit/blob/master/CHANGELOG.md) - [Commits](https://github.com/varvet/pundit/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	8caf69a8ca	Bump rspec-rails from 3.8.1 to 3.8.2 (#9889 ) Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.1 to 3.8.2. - [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.8.1...v3.8.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	b415390cde	Bump addressable from 2.5.2 to 2.6.0 (#9888 ) Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.5.2 to 2.6.0. - [Release notes](https://github.com/sporkmonger/addressable/releases) - [Changelog](https://github.com/sporkmonger/addressable/blob/master/CHANGELOG.md) - [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.5.2...addressable-2.6.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	b49d415f37	Merge branch 'master' into glitch-soc/merge-upstream No conflicts.	6 years ago
dependabot[bot]	7a887ead20	Bump json-ld from 2.2.1 to 3.0.2 (#8804 ) Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 2.2.1 to 3.0.2. - [Release notes](https://github.com/ruby-rdf/json-ld/releases) - [Commits](https://github.com/ruby-rdf/json-ld/compare/2.2.1...3.0.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	e93f8dc9ae	Bump brakeman from 4.3.1 to 4.4.0 (#9848 ) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.3.1 to 4.4.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.3.1...v4.4.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	15b3931d68	Bump bundler-audit from 0.6.0 to 0.6.1 (#9847 ) Bumps [bundler-audit](https://github.com/postmodern/bundler-audit) from 0.6.0 to 0.6.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.0...v0.6.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	fd28bb1403	Bump rubocop from 0.62.0 to 0.63.0 (#9827 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.62.0 to 0.63.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.62.0...v0.63.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	5fc38acb50	Bump oj from 3.7.6 to 3.7.7 (#9828 ) Bumps [oj](https://github.com/ohler55/oj) from 3.7.6 to 3.7.7. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.7.6...v3.7.7) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	a06d3a6082	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/locales/simple_form.pl.yml	6 years ago
Daigo 3 Dango	3fa07a632e	User ruby2.6.0 on Heroku (#9818 )	6 years ago
Eugen Rochko	1c1ca9d155	Add `tootctl domains crawl` (#9809 )	6 years ago
dependabot[bot]	e40989c7f1	Bump aws-sdk-s3 from 1.30.0 to 1.30.1 (#9799 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.30.0 to 1.30.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@dependabot.com>	6 years ago
dependabot[bot]	f4b2bee382	Bump pg from 1.1.3 to 1.1.4 (#9798 ) Bumps [pg](https://bitbucket.org/ged/ruby-pg) from 1.1.3 to 1.1.4. - [Changelog](https://bitbucket.org/ged/ruby-pg/src/default/History.rdoc) - [Commits](https://bitbucket.org/ged/ruby-pg/branches/compare/v1.1.4..v1.1.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	7d01aa6cec	Bump sidekiq-unique-jobs from 5.0.10 to 6.0.8 (#9801 ) Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 5.0.10 to 6.0.8. - [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/v5.0.10...v6.0.8) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	9f94c7e7c0	Bump nokogiri from 1.10.0 to 1.10.1 (#9802 ) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.0 to 1.10.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.10.0...v1.10.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	3e52af845f	Bump nsa from 0.2.4 to 0.2.7 (#9800 ) Bumps [nsa](https://github.com/localshred/nsa) from 0.2.4 to 0.2.7. - [Release notes](https://github.com/localshred/nsa/releases) - [Commits](https://github.com/localshred/nsa/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	df8bc87227	Bump dotenv-rails from 2.5.0 to 2.6.0 (#9803 ) Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.5.0 to 2.6.0. - [Release notes](https://github.com/bkeepers/dotenv/releases) - [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md) - [Commits](https://github.com/bkeepers/dotenv/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	ff721e2d49	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	5e977a865f	Bump sidekiq from 5.2.3 to 5.2.5 (#9765 ) Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.3 to 5.2.5. - [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.3...v5.2.5) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	935c48c606	Bump webpush from 0.3.5 to 0.3.6 (#9783 ) Bumps [webpush](https://github.com/zaru/webpush) from 0.3.5 to 0.3.6. - [Release notes](https://github.com/zaru/webpush/releases) - [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md) - [Commits](https://github.com/zaru/webpush/compare/v0.3.5...v0.3.6) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	a78447a6a4	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.	6 years ago
dependabot[bot]	c380a58218	Bump nokogiri from 1.9.1 to 1.10.0 (#9757 ) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.9.1 to 1.10.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.9.1...v1.10.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	d3f2258ac6	Bump rubocop from 0.61.1 to 0.62.0 (#9702 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.61.1 to 0.62.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.61.1...v0.62.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	38f35886d7	Bump parallel_tests from 2.27.0 to 2.27.1 (#9703 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.27.0 to 2.27.1. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.27.0...v2.27.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	872e1a3018	Bump webpush from 0.3.4 to 0.3.5 (#9701 ) Bumps [webpush](https://github.com/zaru/webpush) from 0.3.4 to 0.3.5. - [Release notes](https://github.com/zaru/webpush/releases) - [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md) - [Commits](https://github.com/zaru/webpush/compare/v0.3.4...v0.3.5) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	2340af313b	Bump tty-prompt from 0.18.0 to 0.18.1 (#9683 ) Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.18.0 to 0.18.1. - [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.18.0...v0.18.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	9a05d6def6	Bump pry-rails from 0.3.8 to 0.3.9 (#9682 ) Bumps [pry-rails](https://github.com/rweng/pry-rails) from 0.3.8 to 0.3.9. - [Release notes](https://github.com/rweng/pry-rails/releases) - [Commits](https://github.com/rweng/pry-rails/compare/v0.3.8...v0.3.9) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	0affc26c26	Bump httplog from 1.1.1 to 1.2.0 (#9681 ) Bumps [httplog](https://github.com/trusche/httplog) from 1.1.1 to 1.2.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.1.1...v1.2.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	6a887e5d0c	Bump tzinfo-data from 1.2018.7 to 1.2018.9 (#9684 ) Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2018.7 to 1.2018.9. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.7...v1.2018.9) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	f46f0b9224	Bump oj from 3.7.4 to 3.7.6 (#9685 ) Bumps [oj](https://github.com/ohler55/oj) from 3.7.4 to 3.7.6. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.7.4...v3.7.6) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	44f2224606	Merge branch 'master' into glitch-soc/merge-upstream Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock	6 years ago
dependabot[bot]	4e09ccd500	Bump webmock from 3.4.2 to 3.5.1 (#9641 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.4.2 to 3.5.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.4.2...v3.5.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	5b350e4f93	Bump cld3 from 3.2.2 to 3.2.3 (#9632 ) Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.2 to 3.2.3. - [Release notes](https://github.com/akihikodaki/cld3-ruby/releases) - [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.2...v3.2.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	720cb01715	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.	6 years ago
dependabot[bot]	6602350f85	Bump nokogiri from 1.8.5 to 1.9.1 (#9557 ) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.5 to 1.9.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.8.5...v1.9.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	a51ca11444	Bump omniauth from 1.8.1 to 1.9.0 (#9544 ) Bumps [omniauth](https://github.com/omniauth/omniauth) from 1.8.1 to 1.9.0. - [Release notes](https://github.com/omniauth/omniauth/releases) - [Commits](https://github.com/omniauth/omniauth/compare/v1.8.1...v1.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	04204427d0	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.	6 years ago
dependabot[bot]	ceca88c28c	Bump aws-sdk-s3 from 1.27.0 to 1.30.0 (#9429 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.27.0 to 1.30.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@dependabot.com>	6 years ago
dependabot[bot]	5340e1c144	Bump redis from 4.0.3 to 4.1.0 (#9520 ) Bumps [redis](https://github.com/redis/redis-rb) from 4.0.3 to 4.1.0. - [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.0.3...v4.1.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	9b922917cb	Bump letter_opener from 1.6.0 to 1.7.0 (#9493 ) Bumps [letter_opener](https://github.com/ryanb/letter_opener) from 1.6.0 to 1.7.0. - [Release notes](https://github.com/ryanb/letter_opener/releases) - [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md) - [Commits](https://github.com/ryanb/letter_opener/compare/v1.6.0...v1.7.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	2e37ff3835	Bump json-ld-preloaded from 2.2.3 to 3.0.0 (#9416 ) Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 2.2.3 to 3.0.0. - [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases) - [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/2.2.3...3.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	b62953b3d2	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.	6 years ago
dependabot[bot]	53c462bf66	Bump rubocop from 0.61.0 to 0.61.1 (#9451 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.61.0 to 0.61.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.61.0...v0.61.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago

... 3 4 5 6 7 ...

858 Commits (d6235f63a556e2b7ad85b25614ade10318e2b4f2)