glitchier-soc

Commit Graph

Author	SHA1	Message	Date
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	6 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>	6 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>	6 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>	6 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
Thibaut Girka	4aca9b4e0f	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	579e2d632a	Bump rails from 5.2.1.1 to 5.2.2 (#9430 ) Bumps [rails](https://github.com/rails/rails) from 5.2.1.1 to 5.2.2. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.1.1...v5.2.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	ae2eafd897	Bump rails-controller-testing from 1.0.3 to 1.0.4 (#9440 ) Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing) from 1.0.3 to 1.0.4. - [Release notes](https://github.com/rails/rails-controller-testing/releases) - [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.3...v1.0.4) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	79c837efd9	Bump rubocop from 0.60.0 to 0.61.0 (#9439 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.60.0 to 0.61.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.60.0...v0.61.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	9734868448	Bump capybara from 3.11.1 to 3.12.0 (#9388 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.11.1 to 3.12.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.11.1...3.12.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	58a6c7004f	Bump rails-controller-testing from 1.0.2 to 1.0.3 (#9417 ) Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing) from 1.0.2 to 1.0.3. - [Release notes](https://github.com/rails/rails-controller-testing/releases) - [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.2...v1.0.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	9cecfb2e4f	Bump pry-rails from 0.3.7 to 0.3.8 (#9418 ) Bumps [pry-rails](https://github.com/rweng/pry-rails) from 0.3.7 to 0.3.8. - [Release notes](https://github.com/rweng/pry-rails/releases) - [Commits](https://github.com/rweng/pry-rails/compare/v0.3.7...v0.3.8) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	e5aadde0d5	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	4813053e97	Preload common JSON-LD contexts (#9412 ) Fixes #9411	6 years ago
Thibaut Girka	fda8506a9c	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	3a75150a93	Bump oj from 3.7.1 to 3.7.4 (#9393 ) Bumps [oj](https://github.com/ohler55/oj) from 3.7.1 to 3.7.4. - [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.1...v3.7.4) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	1b7a2516e8	Bump fastimage from 2.1.4 to 2.1.5 (#9395 ) Bumps [fastimage](https://github.com/sdsykes/fastimage) from 2.1.4 to 2.1.5. - [Release notes](https://github.com/sdsykes/fastimage/releases) - [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.4...v2.1.5) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	77b9249250	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	45cdfe00c5	Bump aws-sdk-s3 from 1.25.0 to 1.27.0 (#9385 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.25.0 to 1.27.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]	33fbb0f65a	[Security] Bump rails from 5.2.1 to 5.2.1.1 (#9383 ) Bumps [rails](https://github.com/rails/rails) from 5.2.1 to 5.2.1.1. This update includes security fixes. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.1...v5.2.1.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	478abe3a58	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).	6 years ago
dependabot[bot]	2490dcffe4	Bump tty-prompt from 0.17.2 to 0.18.0 (#9354 ) Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.17.2 to 0.18.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.17.2...v0.18.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	fd8841ce92	Bump simple_form from 4.0.1 to 4.1.0 (#9331 ) Bumps [simple_form](https://github.com/plataformatec/simple_form) from 4.0.1 to 4.1.0. - [Release notes](https://github.com/plataformatec/simple_form/releases) - [Changelog](https://github.com/plataformatec/simple_form/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/simple_form/compare/v4.0.1...v4.1.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	65989166e0	Bump sidekiq-bulk from 0.1.1 to 0.2.0 (#9306 ) Bumps [sidekiq-bulk](https://github.com/aprescott/sidekiq-bulk) from 0.1.1 to 0.2.0. - [Release notes](https://github.com/aprescott/sidekiq-bulk/releases) - [Changelog](https://github.com/aprescott/sidekiq-bulk/blob/master/CHANGES.md) - [Commits](https://github.com/aprescott/sidekiq-bulk/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	c439d53587	Bump aws-sdk-s3 from 1.24.0 to 1.25.0 (#9321 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.24.0 to 1.25.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]	3c952f58a9	Bump capybara from 3.11.0 to 3.11.1 (#9305 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.11.0 to 3.11.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.11.0...3.11.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	1d97ce7dd8	Bump aws-sdk-s3 from 1.23.1 to 1.24.0 (#9289 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.23.1 to 1.24.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]	82b626a3eb	Bump capybara from 3.10.1 to 3.11.0 (#9285 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.10.1 to 3.11.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.10.1...3.11.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	b3553f992d	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	a82563aebd	Bump parallel_tests from 2.26.2 to 2.27.0 (#9263 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.26.2 to 2.27.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.26.2...v2.27.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	acdc5d658b	Bump thor from 0.20.0 to 0.20.3 (#9266 ) Bumps [thor](https://github.com/wycats/thor) from 0.20.0 to 0.20.3. - [Release notes](https://github.com/wycats/thor/releases) - [Changelog](https://github.com/erikhuda/thor/blob/master/CHANGELOG.md) - [Commits](https://github.com/wycats/thor/compare/v0.20.0...v0.20.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	a4be0edb1a	Bump oj from 3.7.0 to 3.7.1 (#9265 ) Bumps [oj](https://github.com/ohler55/oj) from 3.7.0 to 3.7.1. - [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.0...v3.7.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	aa2edec6c3	Bump bullet from 5.8.1 to 5.9.0 (#9264 ) Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.8.1 to 5.9.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.8.1...5.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	bf26c23205	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	39fb2ab658	Bump tty-prompt from 0.17.1 to 0.17.2 (#9243 ) Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.17.1 to 0.17.2. - [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.17.1...v0.17.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	6dfc7643d8	Bump sidekiq from 5.2.2 to 5.2.3 (#9241 ) Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.2 to 5.2.3. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v5.2.2...v5.2.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	aed0348e73	Bump pry-rails from 0.3.6 to 0.3.7 (#9242 ) Bumps [pry-rails](https://github.com/rweng/pry-rails) from 0.3.6 to 0.3.7. - [Release notes](https://github.com/rweng/pry-rails/releases) - [Commits](https://github.com/rweng/pry-rails/compare/v0.3.6...v0.3.7) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	1e9a0a1a4d	Bump hiredis from 0.6.1 to 0.6.3 (#9240 ) Bumps [hiredis](https://github.com/redis/hiredis-rb) from 0.6.1 to 0.6.3. - [Release notes](https://github.com/redis/hiredis-rb/releases) - [Changelog](https://github.com/redis/hiredis-rb/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/hiredis-rb/compare/v0.6.1...v0.6.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	333d4cbf41	Bump bullet from 5.7.6 to 5.8.1 (#9156 ) Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.7.6 to 5.8.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/5.7.6...5.8.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	20b4adc3a9	Bump parallel_tests from 2.26.0 to 2.26.2 (#9154 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.26.0 to 2.26.2. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.26.0...v2.26.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	900a0d9402	Bump aws-sdk-s3 from 1.23.0 to 1.23.1 (#9174 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.23.0 to 1.23.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]	91584828bb	Bump capybara from 3.10.0 to 3.10.1 (#9216 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.10.0 to 3.10.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.10.0...3.10.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	473638701b	Bump pkg-config from 1.3.1 to 1.3.2 (#9215 ) Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.1 to 1.3.2. - [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.1...1.3.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	e18018e930	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	15fd2bb8cd	[Security] Bump rack from 2.0.5 to 2.0.6 (#9214 ) Bumps [rack](https://github.com/rack/rack) from 2.0.5 to 2.0.6. This update includes security fixes. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/2.0.5...2.0.6) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	88d15e4f6c	Bump active_model_serializers from 0.10.7 to 0.10.8 (#9209 ) Bumps [active_model_serializers](https://github.com/rails-api/active_model_serializers) from 0.10.7 to 0.10.8. - [Release notes](https://github.com/rails-api/active_model_serializers/releases) - [Changelog](https://github.com/rails-api/active_model_serializers/blob/master/CHANGELOG-0-10.md) - [Commits](https://github.com/rails-api/active_model_serializers/compare/v0.10.7...v0.10.8) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	8c19b9abce	Bump rack-attack from 5.4.1 to 5.4.2 (#9186 ) Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 5.4.1 to 5.4.2. - [Release notes](https://github.com/kickstarter/rack-attack/releases) - [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md) - [Commits](https://github.com/kickstarter/rack-attack/compare/v5.4.1...v5.4.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	bdc036586f	Bump redis from 4.0.2 to 4.0.3 (#9187 ) Bumps [redis](https://github.com/redis/redis-rb) from 4.0.2 to 4.0.3. - [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.2...v4.0.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	fd18ed4cea	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.	6 years ago
dependabot[bot]	4d5a219013	[Security] Bump loofah from 2.2.2 to 2.2.3 (#9160 ) Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.2 to 2.2.3. This update includes security fixes. - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md) - [Commits](https://github.com/flavorjones/loofah/compare/v2.2.2...v2.2.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	7406141a71	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	8633ac4b68	Bump oj from 3.6.12 to 3.7.0 (#9155 ) Bumps [oj](https://github.com/ohler55/oj) from 3.6.12 to 3.7.0. - [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.6.12...v3.7.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Eugen Rochko	bd79977354	Bump i18n-tasks from master to 0.9.28 (#9148 )	6 years ago
Thibaut Girka	bc97c2ab8a	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	eaf49c5d94	Bump sanitize from 4.6.6 to 5.0.0 (#9140 )	6 years ago
Thibaut Girka	13ea29754d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/locales/simple_form.ja.yml Not a real conflict, one new string was introduced in glitch and one in upstream.	6 years ago
Eugen Rochko	543bcb5984	Update i18n-tasks to master (#9139 )	6 years ago
dependabot[bot]	469ef48ec6	Bump parallel_tests from 2.25.0 to 2.26.0 (#9137 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.25.0 to 2.26.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.25.0...v2.26.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	0da11a56a9	Bump tzinfo-data from 1.2018.6 to 1.2018.7 (#9136 ) Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2018.6 to 1.2018.7. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.6...v1.2018.7) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	b02fbdb5a5	Bump rubocop from 0.59.2 to 0.60.0 (#9135 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.59.2 to 0.60.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.59.2...v0.60.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	9e7c002d69	Bump doorkeeper from 5.0.1 to 5.0.2 (#9134 ) Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.0.1 to 5.0.2. - [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases) - [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md) - [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.1...v5.0.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	c954f89bdd	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	057c91a4e2	Update i18n-tasks and change CircleCI command (#9104 ) * Update i18n-tasks and CircleCI command * Fix #9088 * Update i18n-tasks * Fix ast	6 years ago
Thibaut Girka	c32a5f86b6	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.	6 years ago
dependabot[bot]	24689747b9	Bump parallel_tests from 2.24.0 to 2.25.0 (#9090 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.24.0 to 2.25.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.24.0...v2.25.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	0e1c4b7d77	Bump aws-sdk-s3 from 1.21.0 to 1.23.0 (#9089 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.21.0 to 1.23.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
Eugen Rochko	7be9dfa8c6	Fix missing plural keys (#9084 ) * Update i18n-tasks to feature-missing-plural-keys * Fix pluralizations with missing keys in Arabic Fix #8554 * Add i18n-tasks missing-plural-keys to CircleCI	6 years ago
dependabot[bot]	534a78c97e	Bump capybara from 3.9.0 to 3.10.0 (#9077 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.9.0 to 3.10.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.9.0...3.10.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	704eff1159	Bump rspec-rails from 3.8.0 to 3.8.1 (#9078 ) Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.0 to 3.8.1. - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.0...v3.8.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	e08d12d1aa	Bump i18n-tasks from 0.9.26 to 0.9.27 (#9079 ) Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.26 to 0.9.27. - [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.26...v0.9.27) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	b0038f959f	Bump i18n-tasks from 0.9.25 to 0.9.26 (#9071 ) Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.25 to 0.9.26. - [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.25...v0.9.26) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	2b7b807df0	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	c02aea6230	Bump parallel_tests from 2.23.0 to 2.24.0 (#9064 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.23.0 to 2.24.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.23.0...v2.24.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	46259a36d0	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.	6 years ago
Eugen Rochko	5b02326d92	Downgrade fog-openstack to 0.3.7 and fog-core to 2.1.0 (#9049 ) Fix #8889	6 years ago
dependabot[bot]	8b72ee011f	Bump strong_migrations from 0.3.0 to 0.3.1 (#9015 ) Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.3.0 to 0.3.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.3.0...v0.3.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	bd77b125d6	Bump tzinfo-data from 1.2018.5 to 1.2018.6 (#9016 ) Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2018.5 to 1.2018.6. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.5...v1.2018.6) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Daigo 3 Dango	4d611170f2	Use Ruby ==2.5.2== 2.5.3 (#9003 ) * Use Ruby 2.5.2 * Specify 2.5.2p104 as RUBY VERSION Heorku refers to RUBY VERSION in Gemfile.lock * Use ruby-2.5.3	6 years ago
dependabot[bot]	8dd6c48031	Bump oj from 3.6.11 to 3.6.12 (#8996 ) Bumps [oj](https://github.com/ohler55/oj) from 3.6.11 to 3.6.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.6.11...v3.6.12) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	84bbed8394	Bump strong_migrations from 0.2.3 to 0.3.0 (#8991 ) Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.2.3 to 0.3.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.2.3...v0.3.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	ba8d358e0d	Bump pundit from 1.1.0 to 2.0.0 (#8873 ) Bumps [pundit](https://github.com/varvet/pundit) from 1.1.0 to 2.0.0. - [Release notes](https://github.com/varvet/pundit/releases) - [Changelog](https://github.com/varvet/pundit/blob/master/CHANGELOG.md) - [Commits](https://github.com/varvet/pundit/compare/v1.1.0...v2.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	4121045113	Bump doorkeeper from 5.0.0 to 5.0.1 (#8954 ) Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.0.0 to 5.0.1. - [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.0...v5.0.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	70a7f72fda	Merge commit '0167397218110e26300bbc6891bc4b1849add083' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	0167397218	Bump better_errors from 2.4.0 to 2.5.0 (#8946 ) Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.4.0 to 2.5.0. - [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.4.0...v2.5.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	9c66e239d1	Bump bullet from 5.7.5 to 5.7.6 (#8947 ) Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.7.5 to 5.7.6. - [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.7.5...5.7.6) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	de89e3670e	Bump scss_lint from 0.57.0 to 0.57.1 (#8948 ) Bumps [scss_lint](https://github.com/brigade/scss-lint) from 0.57.0 to 0.57.1. - [Release notes](https://github.com/brigade/scss-lint/releases) - [Changelog](https://github.com/brigade/scss-lint/blob/master/CHANGELOG.md) - [Commits](https://github.com/brigade/scss-lint/compare/v0.57.0...v0.57.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	8cb843039c	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/javascript/packs/public.js Changes made to app/javascript/packs/publics.js were applied to app/javascript/core/settings.js	6 years ago
dependabot[bot]	02b17344fd	Bump capistrano-rails from 1.3.1 to 1.4.0 (#8936 ) Bumps [capistrano-rails](https://github.com/capistrano/rails) from 1.3.1 to 1.4.0. - [Release notes](https://github.com/capistrano/rails/releases) - [Changelog](https://github.com/capistrano/rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/capistrano/rails/compare/v1.3.1...v1.4.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	a1be1d17fe	Bump dotenv-rails from 2.2.2 to 2.5.0 (#8934 ) Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.2.2 to 2.5.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/compare/v2.2.2...v2.5.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	4580979e28	Bump faker from 1.8.7 to 1.9.1 (#8935 ) Bumps [faker](https://github.com/stympy/faker) from 1.8.7 to 1.9.1. - [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.8.7...v1.9.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	dbaded7ed2	Bump memory_profiler from 0.9.11 to 0.9.12 (#8937 ) Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler) from 0.9.11 to 0.9.12. - [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.11...v0.9.12) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	74e411f4e8	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	e303c0730f	Bump capybara from 3.8.2 to 3.9.0 (#8924 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.8.2 to 3.9.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.8.2...3.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	7e089b5a31	Bump tty-prompt from 0.17.0 to 0.17.1 (#8925 ) Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.17.0 to 0.17.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.17.0...v0.17.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	63581a9262	Bump aws-sdk-s3 from 1.20.0 to 1.21.0 (#8926 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.20.0 to 1.21.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]	098012ab39	Bump i18n-tasks from 0.9.21 to 0.9.25 (#8923 ) Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.21 to 0.9.25. - [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.21...v0.9.25) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	bdbbbb1bdb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	6c328374b4	Remove unused ruby-progressbar dependency (#8896 ) * Remove unused ruby-progressbar dependency * Remove unused colorize dependency	6 years ago
Thibaut Girka	463f250f26	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	645442b1af	Bump omniauth-saml from 1.10.0 to 1.10.1 (#8885 ) Bumps [omniauth-saml](https://github.com/omniauth/omniauth-saml) from 1.10.0 to 1.10.1. - [Release notes](https://github.com/omniauth/omniauth-saml/releases) - [Changelog](https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md) - [Commits](https://github.com/omniauth/omniauth-saml/compare/v1.10.0...v1.10.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	524282ff6b	Bump parallel_tests from 2.21.3 to 2.23.0 (#8884 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.21.3 to 2.23.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.21.3...v2.23.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	b4fedcc15e	Bump puma from 3.11.4 to 3.12.0 (#8883 ) Bumps [puma](https://github.com/puma/puma) from 3.11.4 to 3.12.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v3.11.4...v3.12.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	f627ea99e4	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.	6 years ago
dependabot[bot]	5cdaec1ec2	[Security] Bump nokogiri from 1.8.4 to 1.8.5 (#8881 ) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.4 to 1.8.5. 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.8.4...v1.8.5) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	dba3a17481	Bump fog-openstack, rspec-rails and fog-core (#8877 ) Bumps [fog-openstack](https://github.com/fog/fog-openstack), [rspec-rails](https://github.com/rspec/rspec-rails) and [fog-core](https://github.com/fog/fog-core). These dependencies needed to be updated together. Updates `fog-openstack` from 0.3.6 to 1.0.3 - [Release notes](https://github.com/fog/fog-openstack/releases) - [Changelog](https://github.com/fog/fog-openstack/blob/master/CHANGELOG.md) - [Commits](https://github.com/fog/fog-openstack/compare/v0.3.6...v1.0.3) Updates `rspec-rails` from 3.7.2 to 3.8.0 - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v3.7.2...v3.8.0) Updates `fog-core` from 1.45.0 to 2.1.2 - [Release notes](https://github.com/fog/fog-core/releases) - [Changelog](https://github.com/fog/fog-core/blob/master/changelog.md) - [Commits](https://github.com/fog/fog-core/compare/v1.45.0...v2.1.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	5c7944c05d	Bump webmock from 3.3.0 to 3.4.2 (#8874 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.3.0 to 3.4.2. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.3.0...v3.4.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	f2fb5ff317	Bump fuubar from 2.3.1 to 2.3.2 (#8875 ) Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.3.1 to 2.3.2. - [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.1...releases/v2.3.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	d5137ab0e0	Bump http from 3.2.0 to 3.3.0 (#8871 ) Bumps [http](https://github.com/httprb/http) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/httprb/http/releases) - [Changelog](https://github.com/httprb/http/blob/master/CHANGES.md) - [Commits](https://github.com/httprb/http/compare/v3.2.0...v3.3.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago

... 3 4 5 6 7 ...

755 Commits (e76f4056e528c606ffa2abae7a09f1faef143242)