mastodon

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

Author	SHA1	Message	Date
Thibaut Girka	3baacf6993	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-13 22:11:49 +02:00
dependabot-preview[bot]	78202e9138	Bump doorkeeper from 5.3.3 to 5.4.0 (#13733 ) * Bump doorkeeper from 5.3.3 to 5.4.0 Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.3.3 to 5.4.0. - [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases) - [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md) - [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.3.3...v5.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Fix tests * Fix use of Doorkeeper::AccessToken.find_or_create_for * Fix tests? Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Thibaut Girka <thib@sitedethib.com>	2020-05-12 15:25:33 +02:00
Thibaut Girka	4a70792b4a	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.	2020-05-10 16:19:56 +02:00
dependabot-preview[bot]	ad9c862bb1	Bump capistrano from 3.13.0 to 3.14.0 (#13624 ) * Bump capistrano from 3.13.0 to 3.14.0 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.13.0 to 3.14.0. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.13.0...v3.14.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Update deploy.rb Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2020-05-08 21:29:03 +02:00
dependabot-preview[bot]	043255a45e	Bump rubocop from 0.79.0 to 0.82.0 (#13677 ) * Bump rubocop from 0.79.0 to 0.82.0 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.79.0 to 0.82.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.79.0...v0.82.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Update .codeclimate.yml Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2020-05-08 20:24:26 +02:00
dependabot-preview[bot]	c38c13b204	Bump pry-byebug from 3.8.0 to 3.9.0 (#13653 ) Bumps [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug) from 3.8.0 to 3.9.0. - [Release notes](https://github.com/deivid-rodriguez/pry-byebug/releases) - [Changelog](https://github.com/deivid-rodriguez/pry-byebug/blob/master/CHANGELOG.md) - [Commits](https://github.com/deivid-rodriguez/pry-byebug/compare/v3.8.0...v3.9.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:52:57 +02:00
dependabot-preview[bot]	427a635df9	Bump capybara from 3.31.0 to 3.32.1 (#13641 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.31.0 to 3.32.1. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.31.0...3.32.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:51:49 +02:00
dependabot-preview[bot]	a513124f78	Bump tzinfo-data from 1.2019.3 to 1.2020.1 (#13645 ) Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2019.3 to 1.2020.1. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2019.3...v1.2020.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:50:36 +02:00
dependabot-preview[bot]	dc0a845b5e	Bump better_errors from 2.6.0 to 2.7.0 (#13663 ) Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.6.0 to 2.7.0. - [Release notes](https://github.com/BetterErrors/better_errors/releases) - [Commits](https://github.com/BetterErrors/better_errors/compare/v2.6.0...v2.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:48:12 +02:00
dependabot-preview[bot]	6bb4571232	Bump aws-sdk-s3 from 1.63.0 to 1.64.0 (#13675 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.63.0 to 1.64.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.63.0...v1.64.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:45:34 +02:00
dependabot-preview[bot]	b8eae24b2e	Bump http from 4.3.0 to 4.4.1 (#13598 ) Bumps [http](https://github.com/httprb/http) from 4.3.0 to 4.4.1. - [Release notes](https://github.com/httprb/http/releases) - [Changelog](https://github.com/httprb/http/blob/master/CHANGES.md) - [Commits](https://github.com/httprb/http/compare/v4.3.0...v4.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 18:42:12 +02:00
dependabot-preview[bot]	eb0a323a4b	Bump webpacker from 4.2.2 to 5.1.1 (#13631 ) Bumps [webpacker](https://github.com/rails/webpacker) from 4.2.2 to 5.1.1. - [Release notes](https://github.com/rails/webpacker/releases) - [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/webpacker/compare/v4.2.2...v5.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 17:52:54 +02:00
dependabot-preview[bot]	2b956c1218	Bump rack-attack from 6.2.2 to 6.3.0 (#13657 ) Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 6.2.2 to 6.3.0. - [Release notes](https://github.com/kickstarter/rack-attack/releases) - [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md) - [Commits](https://github.com/kickstarter/rack-attack/compare/v6.2.2...v6.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-08 17:44:24 +02:00
dependabot-preview[bot]	f51c547407	Bump kaminari from 1.1.1 to 1.2.0 (#13596 ) Bumps [kaminari](https://github.com/kaminari/kaminari) from 1.1.1 to 1.2.0. - [Release notes](https://github.com/kaminari/kaminari/releases) - [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md) - [Commits](https://github.com/kaminari/kaminari/compare/v1.1.1...v1.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-04 13:53:42 +02:00
Thibaut Girka	a22e6a3683	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/statuses_controller.rb`: Upstream disabled the embed controller for reblogs. Not a real conflict, but glitch-soc has an extra line to deal with its theming system. Ported upstream changes. - `app/javascript/packs/public.js`: Upstream made changes to get rid of most inline CSS, this changes javascript for public pages, which in glitch are split between different files. Ported those changes. - `app/models/status.rb`: Upstream changed the block check in `Status#permitted_for` to include domain-block checks. Not a real conflict with glitch-soc, but our scope is slightly different, as our scope for unauthenticated access do not include instance-local toots. Ported upstream changes. - `app/serializers/rest/instance_serializer.rb`: Not a real conflict, upstream added a new field to the instance serializer, the conflict is one line above since we added more of that. Ported upstream changes. - `app/views/settings/profiles/show.html.haml`: Upstream got rid of most inline CSS and moved hidden elements to data attributes in the process, in fields were we have different values. Ported upstream changes while keeping our glitch-specific values. - `app/views/statuses/_simple_status.html.haml`: Upstream got rid of inline CSS on an HAML line we treat differently, stripping empty text nodes. Ported upstream changes to the style attribute, keeping the empty text node stripping behavior.	2020-05-03 21:23:49 +02:00
Eugen Rochko	60408fa3ef	Change CircleCI test output (#13587 )	2020-05-01 20:19:01 +02:00
dependabot-preview[bot]	5ed739adb1	Bump aws-sdk-s3 from 1.61.2 to 1.63.0 (#13562 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.61.2 to 1.63.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits/v1.63.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-29 00:21:33 +09:00
Thibaut Girka	66ad30db48	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `package.json`: No real conflict, upstream updated a dependency which is textually adjacent to a glitch-soc-specific dependency. Updated it. - `yarn.lock`: No real conflict, upstream updated a dependency which is textually adjacent to a glitch-soc-specific dependency. Updated it.	2020-04-15 17:07:49 +02:00
dependabot-preview[bot]	1170073a67	Bump rubocop-rails from 2.4.2 to 2.5.2 (#13459 ) Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.4.2 to 2.5.2. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.2...v2.5.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-13 23:36:57 +09:00
dependabot-preview[bot]	00df65df77	Bump capistrano from 3.12.1 to 3.13.0 (#13455 ) Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.12.1 to 3.13.0. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.12.1...v3.13.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-13 23:33:53 +09:00
Thibaut Girka	fdd0beefa7	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `README.md`: We have a different README than upstream, discarded upstream changes and kept ours.	2020-04-12 16:50:27 +02:00
dependabot-preview[bot]	42389bda80	Bump annotate from 3.0.3 to 3.1.1 (#13417 ) Bumps [annotate](https://github.com/ctran/annotate_models) from 3.0.3 to 3.1.1. - [Release notes](https://github.com/ctran/annotate_models/releases) - [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ctran/annotate_models/compare/v3.0.3...v3.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-10 03:32:39 +09:00
Thibaut Girka	9101254d0a	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/javascript/packs/public.js`: Upstream modified code that we split between multiple files due to glitch-soc's theming system. Ported those changes.	2020-04-05 18:32:06 +02:00
Eugen Rochko	5c2e63acd5	Bump rails from 5.2.4.1 to 5.2.4.2 and kind-of from 6.0.2 to 6.0.3 (#13387 ) * Bump rails from 5.2.4.1 to 5.2.4.2 * Bump kind-of from 6.0.2 to 6.0.3	2020-04-04 23:24:59 +02:00
Thibaut Girka	f3eff922a3	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `app/validators/poll_validator.rb`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `config/initializers/content_security_policy.rb`: Upstream added a rule, the way we compute ours is different, but that added rule has been ported. - `package.json`: No real conflict, dependency update. Performed the same update. - `yarn.lock`: No real conflict, dependency update. Performed the same update.	2020-04-02 20:32:00 +02:00
dependabot-preview[bot]	69558d2fe5	Bump rspec-rails from 3.9.1 to 4.0.0 (#13364 ) Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.9.1 to 4.0.0. - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.1...v4.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-02 18:54:41 +02:00
dependabot-preview[bot]	77772baf34	Bump tty-prompt from 0.20.0 to 0.21.0 (#13366 ) Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.20.0 to 0.21.0. - [Release notes](https://github.com/piotrmurach/tty-prompt/releases) - [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md) - [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.20.0...v0.21.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-01 10:02:24 +09:00
dependabot-preview[bot]	66e82e9506	Bump faker from 2.10.1 to 2.11.0 (#13363 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.10.1 to 2.11.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/commits/v2.11.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-04-01 10:01:50 +09:00
dependabot-preview[bot]	caabc0ee76	Bump parallel_tests from 2.30.1 to 2.32.0 (#13341 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.30.1 to 2.32.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.30.1...v2.32.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-31 12:44:33 +02:00
dependabot-preview[bot]	a37ff2bd8b	Bump better_errors from 2.5.1 to 2.6.0 (#13340 ) Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.5.1 to 2.6.0. - [Release notes](https://github.com/BetterErrors/better_errors/releases) - [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.1...v2.6.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-31 12:42:44 +02:00
dependabot-preview[bot]	1bcf466fb1	Bump ox from 2.12.1 to 2.13.2 (#13342 ) Bumps [ox](https://github.com/ohler55/ox) from 2.12.1 to 2.13.2. - [Release notes](https://github.com/ohler55/ox/releases) - [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/ox/compare/v2.12.1...v2.13.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-31 12:42:17 +02:00
dependabot-preview[bot]	bf1919e44a	Bump brakeman from 4.7.2 to 4.8.0 (#13309 ) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.7.2 to 4.8.0. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v4.7.2...v4.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-27 22:35:49 +01:00
Thibaut Girka	7b435fd9bf	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/services/post_status_service.rb`: CW/sensitive logic fixed upstream, but different in glitch-soc. Ported the changes accordingly.	2020-03-27 21:54:44 +01:00
dependabot-preview[bot]	c1a82d9538	Bump aws-sdk-s3 from 1.60.1 to 1.61.1 (#13306 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.60.1 to 1.61.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-25 22:49:27 +01:00
dependabot-preview[bot]	3d7264a94e	Bump discard from 1.1.0 to 1.2.0 (#13308 ) Bumps [discard](https://github.com/jhawthorn/discard) from 1.1.0 to 1.2.0. - [Release notes](https://github.com/jhawthorn/discard/releases) - [Changelog](https://github.com/jhawthorn/discard/blob/master/CHANGELOG.md) - [Commits](https://github.com/jhawthorn/discard/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-25 22:48:52 +01:00
Thibaut Girka	9abb227250	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.	2020-03-22 16:10:44 +01:00
dependabot-preview[bot]	56531d646e	Bump sidekiq from 5.2.7 to 6.0.4 (#11727 ) * Bump sidekiq from 5.2.7 to 6.0.0 Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.7 to 6.0.0. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v5.2.7...v6.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Sidekiq::Logger.logger -> Sidekiq.logger * Drop support Ruby 2.4 * update Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2020-03-21 12:04:54 +09:00
Shlee	b5dace62b0	Decommission support for Ruby 2.4 (#13287 ) * Update Gemfile * Update README.md	2020-03-21 03:10:24 +01:00
dependabot-preview[bot]	c39ad4ab2f	Bump capistrano from 3.11.2 to 3.12.1 (#13264 ) * Bump capistrano from 3.11.2 to 3.12.1 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.11.2 to 3.12.1. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.11.2...v3.12.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Bump capistrano from 3.11.2 to 3.12.1 Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2020-03-18 21:48:03 +09:00
dependabot-preview[bot]	7088633ae1	Bump cld3 from 3.2.6 to 3.3.0 (#13107 ) * Bump cld3 from 3.2.6 to 3.3.0 Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.6 to 3.3.0. - [Release notes](https://github.com/akihikodaki/cld3-ruby/releases) - [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.6...v3.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Fix compatibility with cld3 3.3.0 Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2020-03-09 00:12:52 +01:00
Thibaut Girka	c790ecb14d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.	2020-03-08 19:38:53 +01:00
dependabot-preview[bot]	764b89939f	Bump doorkeeper from 5.2.3 to 5.3.1 (#13144 ) Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.2.3 to 5.3.1. - [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases) - [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md) - [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.2.3...v.5.3.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-03-08 16:22:12 +01:00
dependabot-preview[bot]	74c2490cdd	Bump strong_migrations from 0.5.1 to 0.6.2 (#13071 ) Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.5.1 to 0.6.2. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.5.1...v0.6.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-03-02 21:44:44 +09:00
Thibaut Girka	b0a7cb71be	Update glitch-soc-specific dependencies - drop html2text which has been unused in a while - update redcarpet	2020-02-29 22:32:33 +01:00
Thibaut Girka	85933bc9ff	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-25 14:28:13 +01:00
dependabot-preview[bot]	89a9eeb675	Bump rack from 2.1.2 to 2.2.2 (#13108 ) Bumps [rack](https://github.com/rack/rack) from 2.1.2 to 2.2.2. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/2.1.2...v2.2.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-20 09:24:16 +09:00
Thibaut Girka	e037002401	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-19 23:04:18 +01:00
dependabot-preview[bot]	879b71eacb	Bump json-ld-preloaded from 3.0.6 to 3.1.0 (#12982 ) Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.0.6 to 3.1.0. - [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases) - [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.6...3.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-10 21:26:53 +09:00
dependabot-preview[bot]	432e00af7c	Bump capybara from 3.30.0 to 3.31.0 (#12983 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.30.0 to 3.31.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.30.0...3.31.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-10 20:51:14 +09:00
dependabot-preview[bot]	925159abf0	Bump simplecov from 0.17.1 to 0.18.1 (#13027 ) Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.17.1 to 0.18.1. - [Release notes](https://github.com/colszowka/simplecov/releases) - [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md) - [Commits](https://github.com/colszowka/simplecov/compare/v0.17.1...v0.18.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-10 20:46:25 +09:00
dependabot-preview[bot]	dc8d57d092	Bump pry-byebug from 3.7.0 to 3.8.0 (#12985 ) Bumps [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug) from 3.7.0 to 3.8.0. - [Release notes](https://github.com/deivid-rodriguez/pry-byebug/releases) - [Changelog](https://github.com/deivid-rodriguez/pry-byebug/blob/master/CHANGELOG.md) - [Commits](https://github.com/deivid-rodriguez/pry-byebug/compare/v3.7.0...v3.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-10 20:46:05 +09:00
dependabot-preview[bot]	170e8e0725	Bump letter_opener_web from 1.3.4 to 1.4.0 (#13028 ) Bumps [letter_opener_web](https://github.com/fgrehm/letter_opener_web) from 1.3.4 to 1.4.0. - [Release notes](https://github.com/fgrehm/letter_opener_web/releases) - [Changelog](https://github.com/fgrehm/letter_opener_web/blob/master/CHANGELOG.md) - [Commits](https://github.com/fgrehm/letter_opener_web/compare/v1.3.4...v1.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-10 20:28:22 +09:00
Thibaut Girka	dae5e446fe	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `Gemfile.lock`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `app/lib/sanitize_config.rb`: Upstream added better unsupported link stripping, while we had different sanitizing configs. Took only upstream's link stripping code. - `config/locales/simple_form.pl.yml`: Strings unused in glitch-soc had been removed from glitch-soc, reintroduced them even if they are not useful, to reduce the risk of later merge conflicts.	2020-02-09 12:15:55 +01:00
mayaeh	57c42c20c0	Bump httplog from 1.4.1 to 1.4.2 (#13059 )	2020-02-09 12:05:31 +01:00
Lynne	05064757d9	update gemfile to reflect yanked httplog 1.4.0	2020-02-09 09:49:28 +01:00
mayaeh	d9a4ce4ca2	Bump httplog from 1.4.0 to 1.4.1. (#13051 ) httplog 1.4.0 is yanked.	2020-02-08 21:39:44 +01:00
Thibaut Girka	44744e3ce1	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-28 19:15:03 +01:00
Shlee	720fee0685	Bump Rack from 2.0.8 to 2.1.2 (#12991 ) * Update Gemfile * Update Gemfile.lock	2020-01-28 15:23:16 +01:00
Thibaut Girka	c56a504d11	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/serializers/rest/account_serializer.rb`: Upstream added code too close to glitch-soc-specific followers-hiding code. Ported upstream changes.	2020-01-27 15:46:50 +01:00
Daigo 3 Dango	7b8e0d3477	Explicitly install rack gem (#12972 ) Pin rack version to 2.0.8. Rack-2.1.0 and 2.1.1 are known to record error below upon requests to `/sidekiq`: ``` NoMethodError - undefined method `transform_keys' for #<ActionDispatch::Request::Session:0x...> ```	2020-01-27 11:06:34 +01:00
Thibaut Girka	dc2ab6e646	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/javascript/packs/public.js`: Upstream removed an unused function in code that has been refactored a bit. Removed that function in the corresponding places.	2020-01-20 18:31:11 +01:00
dependabot-preview[bot]	06f6995860	Bump httplog from 1.3.3 to 1.4.0 (#12902 ) Bumps [httplog](https://github.com/trusche/httplog) from 1.3.3 to 1.4.0. - [Release notes](https://github.com/trusche/httplog/releases) - [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md) - [Commits](https://github.com/trusche/httplog/compare/v1.3.3...v1.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-20 23:45:10 +09:00
Thibaut Girka	45709d6987	Merge branch 'master' into glitch-soc/master Conflicts: - `README.md`: We have different README files. Discarded upstream changes. - `app/views/layouts/admin.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `app/views/layouts/embedded.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `yarn.lock`: No real conflict, glitch-specific dependency too close to an updated one. Adapted upstream change.	2020-01-20 15:00:22 +01:00
dependabot-preview[bot]	4bdbaf809b	Bump webmock from 3.7.6 to 3.8.0 (#12900 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.7.6 to 3.8.0. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.7.6...v3.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-20 12:46:03 +01:00
Yamagishi Kazutoshi	114ee287dc	Remove derailed_benchmarks dependency (#12861 )	2020-01-14 00:43:12 +01:00
dependabot-preview[bot]	031a432559	Bump ox from 2.11.0 to 2.12.1 (#12853 ) Bumps [ox](https://github.com/ohler55/ox) from 2.11.0 to 2.12.1. - [Release notes](https://github.com/ohler55/ox/releases) - [Changelog](https://github.com/ohler55/ox/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/ox/compare/v2.11.0...v2.12.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-14 03:02:20 +09:00
dependabot-preview[bot]	2950b09706	Bump json-ld from e742697a0906e74e8bb777ef98137bc3955d981d to 3.1.0 (#12852 ) Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from e742697a0906e74e8bb777ef98137bc3955d981d to 3.1.0. This release includes the previously tagged commit. - [Release notes](https://github.com/ruby-rdf/json-ld/releases) - [Commits](`e742697a09`...3.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-14 03:01:43 +09:00
dependabot-preview[bot]	a0ad1f5cda	Bump rubocop from 0.78.0 to 0.79.0 (#12851 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.78.0 to 0.79.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.78.0...v0.79.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-14 02:58:56 +09:00
Thibaut Girka	980c004f06	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one	2020-01-12 15:57:34 +01:00
ThibG	24cd2126c6	Fix Ruby 2.7 support (#12831 ) - update http gem to avoid errors - update blurhash gem to avoid shared object loading error - update goldfinger gem so the http gem could be updated - update json gem to avoid warnings	2020-01-12 15:49:30 +01:00
ThibG	57e2833f6a	Remove dependency on OStatus2 gem (#12822 )	2020-01-11 21:36:53 +01:00
dependabot-preview[bot]	2a5dee0f08	Bump rqrcode from 0.10.1 to 1.1.2 (#12357 ) Bumps [rqrcode](https://github.com/whomwah/rqrcode) from 0.10.1 to 1.1.2. - [Release notes](https://github.com/whomwah/rqrcode/releases) - [Commits](https://github.com/whomwah/rqrcode/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-11 19:51:04 +09:00
dependabot-preview[bot]	d1f68fb589	Bump rdf-normalize from 0.3.3 to 0.4.0 (#12785 ) Bumps [rdf-normalize](https://github.com/gkellogg/rdf-normalize) from 0.3.3 to 0.4.0. - [Release notes](https://github.com/gkellogg/rdf-normalize/releases) - [Commits](https://github.com/gkellogg/rdf-normalize/compare/0.3.3...0.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-11 07:02:16 +09:00
Shlee	e326b0dda1	Upgrade CircleCI testing to Ruby 2.4-2.7 (#12800 ) * Update config.yml * Update Gemfile	2020-01-10 05:34:25 +01:00
Thibaut Girka	578553ba05	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-07 16:28:59 +01:00
dependabot-preview[bot]	746c4131ec	Bump aws-sdk-s3 from 1.59.0 to 1.60.1 (#12784 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.59.0 to 1.60.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.59.0...v1.60.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-06 23:03:05 +09:00
dependabot-preview[bot]	1d039c27f8	Bump bullet from 6.0.2 to 6.1.0 (#12782 ) Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.0.2 to 6.1.0. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/6.0.2...6.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-06 23:02:46 +09:00
dependabot-preview[bot]	974a015d95	Bump capybara from 3.29.0 to 3.30.0 (#12781 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.29.0 to 3.30.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.29.0...3.30.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-06 22:56:04 +09:00
Thibaut Girka	01eaeab56d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.	2020-01-04 23:04:42 +01:00
Shlee	3537bb1b52	Gemfile Updates - Ruby 2.7 prep (#12758 ) * Update Gemfile * Update Gemfile	2020-01-04 22:48:34 +01:00
Shlee	882a7d3d14	Gemfile Updates - fixes warnings (#12759 ) * Update Gemfile.lock * Update Gemfile.lock * Update Gemfile	2020-01-04 22:48:18 +01:00
dependabot-preview[bot]	d5f93ea618	Bump pg from 1.1.4 to 1.2.0 (#12725 ) Bumps [pg](https://github.com/ged/ruby-pg) from 1.1.4 to 1.2.0. - [Release notes](https://github.com/ged/ruby-pg/releases) - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc) - [Commits](https://github.com/ged/ruby-pg/compare/v1.1.4...v1.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-31 00:21:51 +09:00
dependabot-preview[bot]	a439fc7f72	Bump redis-namespace from 1.6.0 to 1.7.0 (#12727 ) Bumps [redis-namespace](https://github.com/resque/redis-namespace) from 1.6.0 to 1.7.0. - [Release notes](https://github.com/resque/redis-namespace/releases) - [Changelog](https://github.com/resque/redis-namespace/blob/master/CHANGELOG.md) - [Commits](https://github.com/resque/redis-namespace/compare/v1.6.0...v1.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-31 00:16:45 +09:00
dependabot-preview[bot]	333009d8b1	Bump faker from 2.9.0 to 2.10.0 (#12728 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.9.0 to 2.10.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.9.0...v2.10.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-31 00:15:16 +09:00
Thibaut Girka	ad29279214	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `README.md` - `package.json`	2019-12-28 17:48:40 +01:00
dependabot-preview[bot]	ea08fc7dd2	Bump rubocop from 0.77.0 to 0.78.0 (#12677 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.77.0 to 0.78.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.77.0...v0.78.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-25 02:27:14 +09:00
dependabot-preview[bot]	ab25e9e691	Bump faker from 2.8.1 to 2.9.0 (#12680 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.8.1 to 2.9.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.8.1...v2.9.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-25 02:25:14 +09:00
dependabot-preview[bot]	28376b319b	Bump oj from 3.9.2 to 3.10.0 (#12683 ) Bumps [oj](https://github.com/ohler55/oj) from 3.9.2 to 3.10.0. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.9.2...v3.10.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-23 22:35:04 +01:00
Thibaut Girka	ab5ff638f2	Merge branch 'master' into glitch-soc/master Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc	2019-12-19 13:52:54 +01:00
dependabot-preview[bot]	45f8968404	Bump rails from 5.2.3 to 5.2.4 (#12584 ) * Bump rails from 5.2.3 to 5.2.4 Bumps [rails](https://github.com/rails/rails) from 5.2.3 to 5.2.4. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.3...v5.2.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * sprockets ~> 3.7	2019-12-18 08:58:53 +09:00
dependabot-preview[bot]	71b4e2dcbb	Bump parallel_tests from 2.29.2 to 2.30.0 (#12634 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.29.2 to 2.30.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.29.2...v2.30.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-18 03:32:51 +09:00
dependabot-preview[bot]	bc6141b085	Bump rubocop from 0.76.0 to 0.77.0 (#12585 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.76.0 to 0.77.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.76.0...v0.77.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-13 02:57:32 +09:00
Thibaut Girka	be4849c083	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/application_controller.rb Minor conflict due to glitch-soc's theming system	2019-12-12 15:40:06 +01:00
dependabot-preview[bot]	d08a497946	Bump aws-sdk-s3 from 1.57.0 to 1.59.0 (#12581 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.57.0 to 1.59.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.57.0...v1.59.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-11 20:39:11 +09:00
dependabot-preview[bot]	ba2eac8824	Bump strong_migrations from 0.4.2 to 0.5.0 (#12583 ) Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.4.2 to 0.5.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.4.2...v0.5.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-11 00:55:03 +01:00
Thibaut Girka	abcba5c198	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc.	2019-12-07 12:28:59 +01:00
dependabot-preview[bot]	0465d2a3ce	[Security] Bump puma from 4.2.0 to 4.3.1 (#12559 ) Bumps [puma](https://github.com/puma/puma) from 4.2.0 to 4.3.1. This update includes a security fix. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v4.2.0...v4.3.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-06 19:44:09 +01:00
dependabot-preview[bot]	5097a8d12c	Bump faker from 2.7.0 to 2.8.0 (#12531 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.7.0 to 2.8.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.7.0...v2.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-03 02:38:17 +09:00
dependabot-preview[bot]	f64a132396	Bump aws-sdk-s3 from 1.55.0 to 1.57.0 (#12528 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.55.0 to 1.57.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.55.0...v1.57.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-02 23:03:46 +09:00
dependabot-preview[bot]	c9249fbb15	Bump tty-prompt from 0.19.0 to 0.20.0 (#12529 ) Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.19.0 to 0.20.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.19.0...v0.20.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-02 22:58:07 +09:00
dependabot-preview[bot]	99f9579a04	Bump rubocop-rails from 2.3.2 to 2.4.0 (#12532 ) Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.3.2 to 2.4.0. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.3.2...v2.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-02 22:56:53 +09:00
dependabot-preview[bot]	0a1824d0f0	Bump fabrication from 2.20.2 to 2.21.0 (#12527 ) Bumps [fabrication](https://github.com/paulelliott/fabrication) from 2.20.2 to 2.21.0. - [Release notes](https://github.com/paulelliott/fabrication/releases) - [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown) - [Commits](https://github.com/paulelliott/fabrication/compare/2.20.2...2.21.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-02 22:55:43 +09:00
Thibaut Girka	2b7158427f	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-30 17:29:44 +01:00
dependabot-preview[bot]	8040923501	Bump net-ldap from 0.16.1 to 0.16.2 (#12479 ) Bumps [net-ldap](https://github.com/ruby-ldap/ruby-net-ldap) from 0.16.1 to 0.16.2. - [Release notes](https://github.com/ruby-ldap/ruby-net-ldap/releases) - [Changelog](https://github.com/ruby-ldap/ruby-net-ldap/blob/master/History.rdoc) - [Commits](https://github.com/ruby-ldap/ruby-net-ldap/compare/v0.16.1...v0.16.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-11-27 21:33:20 +09:00
dependabot-preview[bot]	c455a314fd	Bump parallel from 1.18.0 to 1.19.1 (#12475 ) Bumps [parallel](https://github.com/grosser/parallel) from 1.18.0 to 1.19.1. - [Release notes](https://github.com/grosser/parallel/releases) - [Commits](https://github.com/grosser/parallel/compare/v1.18.0...v1.19.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-11-27 20:49:19 +09:00
dependabot-preview[bot]	d4a2467c81	Bump rack-cors from 1.0.6 to 1.1.0 (#12477 ) Bumps [rack-cors](https://github.com/cyu/rack-cors) from 1.0.6 to 1.1.0. - [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.6...v1.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-11-27 11:59:57 +09:00
dependabot-preview[bot]	19feb9b667	Bump charlock_holmes from 0.7.6 to 0.7.7 (#12474 ) Bumps [charlock_holmes](https://github.com/brianmario/charlock_holmes) from 0.7.6 to 0.7.7. - [Release notes](https://github.com/brianmario/charlock_holmes/releases) - [Commits](https://github.com/brianmario/charlock_holmes/compare/0.7.6...v0.7.7) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-11-27 11:53:50 +09:00
dependabot-preview[bot]	7c9cb9d7e8	Bump pghero from 2.3.0 to 2.4.1 (#12478 ) Bumps [pghero](https://github.com/ankane/pghero) from 2.3.0 to 2.4.1. - [Release notes](https://github.com/ankane/pghero/releases) - [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/pghero/compare/v2.3.0...v2.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-11-27 09:03:02 +09:00
Thibaut Girka	d52e27f3db	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-20 17:57:17 +01:00
dependabot-preview[bot]	5605b828e5	Bump webpacker from 4.0.7 to 4.2.0 (#12416 ) * Bump webpacker from 4.0.7 to 4.2.0 Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.7 to 4.2.0. - [Release notes](https://github.com/rails/webpacker/releases) - [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/webpacker/compare/v4.0.7...v4.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Use NODE_ENV=tests instead of test, to work around async modules not having a chunk	2019-11-20 17:56:11 +01:00
Thibaut Girka	ff67385cfb	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code	2019-11-20 15:36:09 +01:00
dependabot-preview[bot]	4e992e4ea8	Bump aws-sdk-s3 from 1.52.0 to 1.55.0 (#12419 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.52.0 to 1.55.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.52.0...v1.55.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-11-18 22:40:16 +09:00
dependabot-preview[bot]	f2362f642a	Bump rack-attack from 6.1.0 to 6.2.1 (#12421 ) Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 6.1.0 to 6.2.1. - [Release notes](https://github.com/kickstarter/rack-attack/releases) - [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md) - [Commits](https://github.com/kickstarter/rack-attack/compare/v6.1.0...v6.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-11-18 22:26:08 +09:00
dependabot-preview[bot]	a3a109d12c	Bump parallel from 1.17.0 to 1.18.0 (#12358 ) Bumps [parallel](https://github.com/grosser/parallel) from 1.17.0 to 1.18.0. - [Release notes](https://github.com/grosser/parallel/releases) - [Commits](https://github.com/grosser/parallel/compare/v1.17.0...v1.18.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-11-11 22:43:43 +09:00
dependabot-preview[bot]	b0c4eb28e0	Bump rubocop from 0.75.1 to 0.76.0 (#12355 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.75.1 to 0.76.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.75.1...v0.76.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-11-11 22:42:50 +09:00
dependabot-preview[bot]	6fa2f3eba3	Bump faker from 2.6.0 to 2.7.0 (#12354 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.6.0 to 2.7.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.6.0...v2.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-11-11 22:38:07 +09:00
dependabot-preview[bot]	e311131176	Bump stoplight from 2.1.3 to 2.2.0 (#12360 ) Bumps [stoplight](https://github.com/orgsync/stoplight) from 2.1.3 to 2.2.0. - [Release notes](https://github.com/orgsync/stoplight/releases) - [Changelog](https://github.com/orgsync/stoplight/blob/master/CHANGELOG.md) - [Commits](https://github.com/orgsync/stoplight/compare/v2.1.3...v2.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-11-11 22:34:48 +09:00
dependabot-preview[bot]	c6960938dd	Bump fuubar from 2.4.1 to 2.5.0 (#12356 ) Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.4.1 to 2.5.0. - [Release notes](https://github.com/thekompanee/fuubar/releases) - [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md) - [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.4.1...releases/v2.5.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-11-11 22:05:16 +09:00
dependabot-preview[bot]	05ae908d3f	[Security] Bump brakeman from 4.6.1 to 4.7.1 (#12329 ) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.6.1 to 4.7.1. This update includes a security fix. - [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.6.1...v4.7.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-11-08 14:45:42 +09:00
Thibaut Girka	0ae7d84273	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `package.json`	2019-11-06 14:38:28 +01:00
dependabot-preview[bot]	685b0db882	Bump aws-sdk-s3 from 1.48.0 to 1.52.0 (#12250 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.48.0 to 1.52.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.48.0...v1.52.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-10-30 19:58:11 +09:00
dependabot-preview[bot]	741a85c064	Bump annotate from 2.7.5 to 3.0.2 (#12100 ) Bumps [annotate](https://github.com/ctran/annotate_models) from 2.7.5 to 3.0.2. - [Release notes](https://github.com/ctran/annotate_models/releases) - [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.rdoc) - [Commits](https://github.com/ctran/annotate_models/compare/v2.7.5...v3.0.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-10-30 19:04:00 +09:00
dependabot-preview[bot]	0745fa8449	[Security] Bump simple_form from 4.1.0 to 5.0.1 (#12099 ) Bumps [simple_form](https://github.com/plataformatec/simple_form) from 4.1.0 to 5.0.1. This update includes a security fix. - [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.1.0...v5.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-10-30 19:00:41 +09:00
dependabot-preview[bot]	291106e11c	Bump rspec-rails from 3.8.2 to 3.9.0 (#12241 ) Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.2 to 3.9.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.8.2...v3.9.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-10-29 19:40:52 +09:00
dependabot-preview[bot]	0caa707726	Bump active_record_query_trace from 1.6.2 to 1.7 (#12243 ) Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace) from 1.6.2 to 1.7. - [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.2...v1.7) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-10-29 10:55:07 +09:00
dependabot-preview[bot]	254ddfc08a	Bump pkg-config from 1.3.9 to 1.4.0 (#12239 ) Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config) from 1.3.9 to 1.4.0. - [Release notes](https://github.com/ruby-gnome/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.3.9...1.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-10-28 20:48:08 +09:00
dependabot-preview[bot]	4ecfd4308d	Bump faker from 2.5.0 to 2.6.0 (#12244 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.5.0 to 2.6.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.5.0...v2.6.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-10-28 20:47:14 +09:00
Thibaut Girka	41a98b6543	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb	2019-10-27 12:14:01 +01:00
dependabot-preview[bot]	7840844919	Bump rubocop from 0.74.0 to 0.75.1 (#12191 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.74.0 to 0.75.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.74.0...v0.75.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-10-21 23:43:49 +09:00
Thibaut Girka	61631f4751	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline	2019-10-10 17:26:08 +02:00
dependabot-preview[bot]	115c58e9a2	Bump faker from 2.4.0 to 2.5.0 (#12010 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.4.0 to 2.5.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.4.0...v2.5.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-10-04 10:21:56 +09:00
dependabot-preview[bot]	e320f240f6	Bump tty-command from 0.8.2 to 0.9.0 (#12009 ) Bumps [tty-command](https://github.com/piotrmurach/tty-command) from 0.8.2 to 0.9.0. - [Release notes](https://github.com/piotrmurach/tty-command/releases) - [Changelog](https://github.com/piotrmurach/tty-command/blob/master/CHANGELOG.md) - [Commits](https://github.com/piotrmurach/tty-command/compare/v0.8.2...v0.9.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-10-04 10:19:54 +09:00
Thibaut Girka	a84aedb7a7	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/media_attachment.rb Upstream raised max image size from 8MB to 10MB while our limit is configurable. Raised the default to 10MB.	2019-10-03 11:10:12 +02:00
Takeshi Umeda	0ce0baa9b5	Add parallelization to `tootctl search deploy` (#12051 ) * Add parallel gem * Modify parallel option in tootctl search deploy * Add paralell option to tootctl search deploy * Change 1 to false * Clean up * Rename --parallel to --processes	2019-10-02 21:50:43 +02:00
Thibaut Girka	16ff7c5627	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb	2019-09-30 12:23:57 +02:00
Yamagishi Kazutoshi	a5c558f052	Hide error message on /heath (#11947 ) * Hide error message on /heath * update health_check	2019-09-24 20:28:25 +02:00
dependabot-preview[bot]	1051c5cffa	Bump puma from 4.1.1 to 4.2.0 (#11939 ) Bumps [puma](https://github.com/puma/puma) from 4.1.1 to 4.2.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v4.1.1...v4.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-09-23 15:39:11 +02:00
dependabot-preview[bot]	3ff74cea72	Bump faker from 2.3.0 to 2.4.0 (#11933 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.3.0 to 2.4.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.3.0...v2.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-09-23 19:25:59 +09:00
dependabot-preview[bot]	92c2498554	Bump doorkeeper from 5.1.0 to 5.2.0 (#11856 ) Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.1.0 to 5.2.0. - [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases) - [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md) - [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.1.0...v5.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-09-20 02:19:12 +09:00
Thibaut Girka	5cadb47238	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code	2019-09-18 17:25:56 +02:00
dependabot-preview[bot]	576377a382	Bump capybara from 3.28.0 to 3.29.0 (#11854 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.28.0 to 3.29.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.28.0...3.29.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-09-16 16:12:30 +02:00
dependabot-preview[bot]	b0148d4c05	Bump faker from 2.2.2 to 2.3.0 (#11858 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.2.2 to 2.3.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.2.2...v2.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-09-16 14:29:29 +02:00
Thibaut Girka	74c5b2bd08	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)	2019-09-13 18:13:43 +02:00
Eugen Rochko	8674814825	Change tootctl to use inline parallelization instead of Sidekiq (#11776 ) - Remove --background option - Add --concurrency(=5) option - Add progress bars	2019-09-10 13:48:48 +02:00
dependabot-preview[bot]	9aa2a5320e	Bump sanitize from 5.0.0 to 5.1.0 (#11786 ) Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.0.0 to 5.1.0. - [Release notes](https://github.com/rgrove/sanitize/releases) - [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md) - [Commits](https://github.com/rgrove/sanitize/compare/v5.0.0...v5.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-09-09 20:08:45 +09:00
dependabot-preview[bot]	5dcacde6a2	Bump mime-types from 3.2.2 to 3.3 (#11788 ) Bumps [mime-types](https://github.com/mime-types/ruby-mime-types) from 3.2.2 to 3.3. - [Release notes](https://github.com/mime-types/ruby-mime-types/releases) - [Changelog](https://github.com/mime-types/ruby-mime-types/blob/master/History.md) - [Commits](https://github.com/mime-types/ruby-mime-types/compare/v3.2.2...v3.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-09-09 20:03:07 +09:00
Yamagishi Kazutoshi	d7268befa8	Add healthcheck endpoint for web (#11770 )	2019-09-07 02:47:51 +02:00
Thibaut Girka	5088eb8388	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-05 11:36:41 +02:00
dependabot-preview[bot]	529856a608	Bump addressable from 2.6.0 to 2.7.0 (#11732 ) Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.6.0 to 2.7.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.6.0...addressable-2.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-09-05 12:31:47 +09:00
dependabot-preview[bot]	80f86f290f	Bump aws-sdk-s3 from 1.46.0 to 1.48.0 (#11729 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.46.0 to 1.48.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.46.0...v1.48.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-09-05 01:46:37 +09:00
dependabot-preview[bot]	e9dbb955a8	Bump faker from 2.1.2 to 2.2.1 (#11733 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.1.2 to 2.2.1. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.1.2...v2.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-09-05 01:44:01 +09:00
dependabot-preview[bot]	15d6a10c02	Bump webmock from 3.6.2 to 3.7.1 (#11734 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.6.2 to 3.7.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.6.2...v3.7.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-09-05 01:42:35 +09:00
Thibaut Girka	9044a2b051	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.	2019-08-30 13:38:41 +02:00
Eugen Rochko	18e37bee16	Fix JSON-LD deprecation warning in log output (#11699 )	2019-08-30 01:34:21 +02:00
Thibaut Girka	48b8a1f414	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.	2019-08-29 12:07:50 +02:00
dependabot-preview[bot]	eb66af538a	Bump devise from 4.6.2 to 4.7.0 (#11667 ) Bumps [devise](https://github.com/plataformatec/devise) from 4.6.2 to 4.7.0. - [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.6.2...v4.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-08-26 23:04:52 +09:00
Eugen Rochko	282ea17078	Add soft delete for statuses for instant deletes through API (#11623 ) * Add soft delete for statuses to allow them to appear instant * Allow reporting soft-deleted statuses and show them in the admin UI * Change index for getting an account's statuses	2019-08-22 21:55:56 +02:00
Thibaut Girka	1488be7d96	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json	2019-08-19 21:49:35 +02:00
dependabot-preview[bot]	92f60ba114	Bump simple-navigation from 4.0.5 to 4.1.0 (#11617 ) Bumps [simple-navigation](https://github.com/codeplant/simple-navigation) from 4.0.5 to 4.1.0. - [Release notes](https://github.com/codeplant/simple-navigation/releases) - [Changelog](https://github.com/codeplant/simple-navigation/blob/master/CHANGELOG.md) - [Commits](https://github.com/codeplant/simple-navigation/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-08-20 01:49:17 +09:00
dependabot-preview[bot]	3dd0938369	Bump pghero from 2.2.1 to 2.3.0 (#11615 ) Bumps [pghero](https://github.com/ankane/pghero) from 2.2.1 to 2.3.0. - [Release notes](https://github.com/ankane/pghero/releases) - [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/pghero/compare/v2.2.1...v2.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-08-19 22:37:22 +09:00
dependabot-preview[bot]	994bda37d5	Bump pundit from 2.0.1 to 2.1.0 (#11613 ) Bumps [pundit](https://github.com/varvet/pundit) from 2.0.1 to 2.1.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/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-08-19 22:36:45 +09:00
dependabot-preview[bot]	8578fe8014	Bump rubocop-rails from 2.2.1 to 2.3.0 (#11612 ) Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.2.1 to 2.3.0. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.2.1...v2.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-08-19 22:34:30 +09:00
dependabot-preview[bot]	eaf09997f0	Bump oj from 3.8.1 to 3.9.0 (#11611 ) Bumps [oj](https://github.com/ohler55/oj) from 3.8.1 to 3.9.0. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.8.1...v3.9.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-08-19 22:32:28 +09:00
Thibaut Girka	c4ae7aab6f	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-12 16:24:22 +02:00
dependabot-preview[bot]	ccb2b6afb1	Bump devise-two-factor from 3.0.3 to 3.1.0 (#11550 ) Bumps [devise-two-factor](https://github.com/tinfoil/devise-two-factor) from 3.0.3 to 3.1.0. - [Release notes](https://github.com/tinfoil/devise-two-factor/releases) - [Changelog](https://github.com/tinfoil/devise-two-factor/blob/master/CHANGELOG.md) - [Commits](https://github.com/tinfoil/devise-two-factor/compare/v3.0.3...v3.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-08-12 20:11:55 +09:00
dependabot-preview[bot]	ff1333ff40	Bump puma from 4.0.1 to 4.1.0 (#11548 ) Bumps [puma](https://github.com/puma/puma) from 4.0.1 to 4.1.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v4.0.1...v4.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-08-12 20:11:18 +09:00
Thibaut Girka	04534604c6	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/views/admin/dashboard/index.html.haml - config/locales/simple_form.en.yml	2019-08-07 13:56:48 +02:00
Yusuke Nakamura	82d2069c75	Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489 ) * Bump faker from 1.9.6 to 2.1.0 Bumps [faker](https://github.com/stympy/faker) from 1.9.6 to 2.1.0. - [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/1.9.6...v2.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Use faker api v2 https://github.com/stympy/faker/releases/tag/2.0	2019-08-06 15:33:03 +02:00
Thibaut Girka	e50554391a	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-05 13:13:28 +02:00
dependabot-preview[bot]	6201bfdfba	Bump rubocop from 0.73.0 to 0.74.0 (#11486 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.73.0 to 0.74.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.73.0...v0.74.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-08-05 18:53:30 +09:00
dependabot-preview[bot]	f88550a6cb	Bump capybara from 3.27.0 to 3.28.0 (#11484 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.27.0 to 3.28.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.27.0...3.28.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-08-05 18:25:40 +09:00
Thibaut Girka	24968d20a0	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock	2019-07-30 12:22:33 +02:00
Milan	658277b07e	let bundler fetch http_parser.rb submodules (#11444 )	2019-07-29 20:42:04 +02:00
dependabot-preview[bot]	44ae763312	Bump capybara from 3.26.0 to 3.27.0 (#11437 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.26.0 to 3.27.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.26.0...3.27.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-29 22:48:56 +09:00
dependabot-preview[bot]	dbb74ad351	Bump brakeman from 4.5.1 to 4.6.1 (#11438 ) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.5.1 to 4.6.1. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v4.5.1...v4.6.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-29 22:37:02 +09:00
dependabot-preview[bot]	6aca7969c9	Bump aws-sdk-s3 from 1.45.0 to 1.46.0 (#11439 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.45.0 to 1.46.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.45.0...v1.46.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-29 22:29:17 +09:00
Thibaut Girka	bca3825c17	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-28 16:28:05 +02:00
dependabot-preview[bot]	15de24a425	Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316 ) * Bump json-ld-preloaded from 3.0.2 to 3.0.3 Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.0.2 to 3.0.3. - [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases) - [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.2...3.0.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * use json-ld edge	2019-07-28 13:48:43 +02:00
Eugen Rochko	b9fbcbfe4e	Add search syntax for operators and phrases (#11411 )	2019-07-27 04:42:08 +02:00
Thibaut Girka	444796b69b	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb	2019-07-23 10:51:07 +02:00
dependabot-preview[bot]	05b8468755	Bump oj from 3.7.12 to 3.8.0 (#11387 ) Bumps [oj](https://github.com/ohler55/oj) from 3.7.12 to 3.8.0. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.7.12...v3.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-22 23:07:42 +09:00
dependabot-preview[bot]	e980e19a91	Bump rubocop from 0.72.0 to 0.73.0 (#11384 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.72.0 to 0.73.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.72.0...v0.73.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-22 23:06:34 +09:00
dependabot-preview[bot]	b47e3b6cd8	Bump capybara from 3.25.0 to 3.26.0 (#11385 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.25.0 to 3.26.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.25.0...3.26.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-22 23:04:17 +09:00
Thibaut Girka	249991c498	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml	2019-07-19 18:26:49 +02:00
dependabot-preview[bot]	3a6fe657ba	Bump rack-attack from 6.0.0 to 6.1.0 (#11313 ) Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/kickstarter/rack-attack/releases) - [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md) - [Commits](https://github.com/kickstarter/rack-attack/compare/v6.0.0...v6.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-18 01:07:02 +02:00
dependabot-preview[bot]	7cc98eba28	Bump puma from 3.12.1 to 4.0.1 (#11306 ) Bumps [puma](https://github.com/puma/puma) from 3.12.1 to 4.0.1. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v3.12.1...v4.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-18 01:06:14 +02:00
dependabot-preview[bot]	18d2eeeb38	Bump rubocop-rails from 2.0.1 to 2.2.0 (#11257 ) Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.0.1 to 2.2.0. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.0.1...v2.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-15 00:48:50 +02:00
dependabot-preview[bot]	2f441876c7	Bump simplecov from 0.16.1 to 0.17.0 (#11260 ) Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.16.1 to 0.17.0. - [Release notes](https://github.com/colszowka/simplecov/releases) - [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md) - [Commits](https://github.com/colszowka/simplecov/compare/v0.16.1...v0.17.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-15 00:48:50 +02:00
dependabot-preview[bot]	23978df143	Bump aws-sdk-s3 from 1.43.0 to 1.45.0 (#11262 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.43.0 to 1.45.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.43.0...v1.45.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-15 00:48:50 +02:00
dependabot-preview[bot]	6af0c955e1	Bump rubocop-rails from 2.0.1 to 2.2.0 (#11257 ) Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.0.1 to 2.2.0. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.0.1...v2.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-13 23:52:08 +09:00
Eugen Rochko	6ff67be0f6	Add a spam check (#11217 ) * Add a spam check * Use Nilsimsa to generate locality-sensitive hashes and compare using Levenshtein distance * Add more tests * Add exemption when the message is a reply to something that mentions the sender * Use Nilsimsa Compare Value instead of Levenshtein distance * Use MD5 for messages shorter than 10 characters * Add message to automated report, do not add non-public statuses to automated report, add trust level to accounts and make unsilencing raise the trust level to prevent repeated spam checks on that account * Expire spam check data after 3 months * Add support for local statuses, reduce expiration to 1 week, always create a report * Add content warnings to the spam check and exempt empty statuses * Change Nilsimsa threshold to 95 and make sure removed statuses are removed from the spam check * Add all matched statuses into automatic report	2019-07-13 16:45:50 +02:00
dependabot-preview[bot]	d76ca8964c	Bump simplecov from 0.16.1 to 0.17.0 (#11260 ) Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.16.1 to 0.17.0. - [Release notes](https://github.com/colszowka/simplecov/releases) - [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md) - [Commits](https://github.com/colszowka/simplecov/compare/v0.16.1...v0.17.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-08 18:28:33 +09:00
dependabot-preview[bot]	01ee35f14a	Bump aws-sdk-s3 from 1.43.0 to 1.45.0 (#11262 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.43.0 to 1.45.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.43.0...v1.45.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-08 18:26:41 +09:00
Thibaut Girka	6ab84c12a7	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-04 16:21:39 +02:00
Eugen Rochko	0d9ffe56fb	Add request pool to improve delivery performance (#10353 ) * Add request pool to improve delivery performance Fix #7909 * Ensure connection is closed when exception interrupts execution * Remove Timeout#timeout from socket connection * Fix infinite retrial loop on HTTP::ConnectionError * Close sockets on failure, reduce idle time to 90 seconds * Add MAX_REQUEST_POOL_SIZE option to limit concurrent connections to the same server * Use a shared pool size, 512 by default, to stay below open file limit * Add some tests * Add more tests * Reduce MAX_IDLE_TIME from 90 to 30 seconds, reap every 30 seconds * Use a shared pool that returns preferred connection but re-purposes other ones when needed * Fix wrong connection being returned on subsequent calls within the same thread * Reduce mutex calls on flushes from 2 to 1 and add test for reaping	2019-07-02 00:34:38 +02:00
dependabot-preview[bot]	13f54f41ad	Bump rubocop from 0.71.0 to 0.72.0 (#11229 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.71.0 to 0.72.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.71.0...v0.72.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-01 22:36:45 +09:00
dependabot-preview[bot]	ffb6da8b78	Bump capybara from 3.24.0 to 3.25.0 (#11225 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.24.0 to 3.25.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.24.0...3.25.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-01 22:34:51 +09:00
Thibaut Girka	aaec64a500	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb - config/locales/simple_form.en.yml	2019-06-26 23:19:22 +02:00
dependabot-preview[bot]	1afb8cac2f	Bump aws-sdk-s3 from 1.42.0 to 1.43.0 (#11172 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.42.0 to 1.43.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.42.0...v1.43.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-06-25 22:45:32 +09:00
Thibaut Girka	356e9150df	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/lib/sanitize_config.rb Keep our version, we support the tags upstream transforms. - package.json - yarn.lock	2019-06-19 18:36:16 +02:00
dependabot-preview[bot]	54438042f1	Bump capybara from 3.22.0 to 3.24.0 (#11100 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.22.0 to 3.24.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.22.0...3.24.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-06-17 23:23:13 +09:00
dependabot-preview[bot]	9639a7f87a	Bump ox from 2.10.1 to 2.11.0 (#11101 ) Bumps ox from 2.10.1 to 2.11.0. Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-06-17 22:50:20 +09:00
dependabot-preview[bot]	f4539845e0	Bump webmock from 3.5.1 to 3.6.0 (#11031 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.5.1 to 3.6.0. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.5.1...v3.6.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-06-17 21:17:45 +09:00
dependabot-preview[bot]	f765cd97b2	Bump aws-sdk-s3 from 1.41.0 to 1.42.0 (#11030 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.41.0 to 1.42.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.41.0...v1.42.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-06-17 21:15:33 +09:00
Thibaut Girka	34b8346e7f	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb	2019-06-07 17:00:36 +02:00
Yamagishi Kazutoshi	70423ce81f	require rubocop-rails in .rubocop.yml (#10974 ) * Revert "Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965)" This reverts commit `121d19d7fa`. * Disable Rails/HelperInstanceVariable	2019-06-06 12:31:48 +02:00
Thibaut Girka	02b56c7e1a	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	2019-06-04 20:40:19 +02:00
Yamagishi Kazutoshi	121d19d7fa	Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965 )	2019-06-04 19:35:19 +02:00
Yamagishi Kazutoshi	3e56f95c73	Replace from scss-lint to sass-lint (#10958 )	2019-06-04 17:23:18 +02:00
Yamagishi Kazutoshi	3f536f06d6	Use rubocop-rails (#10957 )	2019-06-04 15:25:52 +02:00
dependabot-preview[bot]	c11742dd9b	Bump fuubar from 2.3.2 to 2.4.0 (#10947 ) Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.3.2 to 2.4.0. - [Release notes](https://github.com/thekompanee/fuubar/releases) - [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md) - [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.3.2...releases/v2.4.0)	2019-06-04 14:15:32 +09:00
Thibaut Girka	76918554a6	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream Conflicts: - Gemfile.lock - config/webpack/rules/css.js - package.json - yarn.lock	2019-06-03 14:54:30 +02:00
dependabot-preview[bot]	5677172d86	Bump rubocop from 0.70.0 to 0.71.0 (#10901 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.70.0 to 0.71.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.70.0...v0.71.0)	2019-05-30 23:17:54 +09:00
Thibaut Girka	06036081a0	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-30 13:31:01 +02:00
dependabot-preview[bot]	dee4f1878d	Bump aws-sdk-s3 from 1.40.0 to 1.41.0 (#10892 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.40.0 to 1.41.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.40.0...v1.41.0)	2019-05-30 12:58:22 +09:00
dependabot-preview[bot]	fa48cf96de	Bump capybara from 3.21.0 to 3.22.0 (#10893 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.21.0 to 3.22.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.21.0...3.22.0)	2019-05-30 09:37:11 +09:00
dependabot-preview[bot]	26e290ae64	Bump strong_migrations from 0.3.1 to 0.4.0 (#10871 ) Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.3.1 to 0.4.0. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.3.1...v0.4.0)	2019-05-29 18:22:59 +09:00
dependabot-preview[bot]	61ab5b0c83	Bump capybara from 3.20.2 to 3.21.0 (#10854 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.20.2 to 3.21.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.20.2...3.21.0)	2019-05-29 11:21:22 +09:00
dependabot-preview[bot]	0b1c7150da	Bump tty-prompt from 0.18.1 to 0.19.0 (#10870 ) Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.18.1 to 0.19.0. - [Release notes](https://github.com/piotrmurach/tty-prompt/releases) - [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md) - [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.18.1...v0.19.0)	2019-05-29 11:10:24 +09:00
Thibaut Girka	c0dc247bce	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.	2019-05-23 19:01:30 +02:00
dependabot[bot]	ce8de3a6e5	Bump aws-sdk-s3 from 1.39.0 to 1.40.0 (#10803 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.39.0 to 1.40.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.39.0...v1.40.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-05-22 22:31:05 +09:00
dependabot[bot]	bc23de458e	Bump rubocop from 0.69.0 to 0.70.0 (#10802 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.69.0 to 0.70.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.69.0...v0.70.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-05-22 22:09:10 +09:00
dependabot[bot]	4d65740663	Bump httplog from 1.2.2 to 1.3.0 (#10795 ) Bumps [httplog](https://github.com/trusche/httplog) from 1.2.2 to 1.3.0. - [Release notes](https://github.com/trusche/httplog/releases) - [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md) - [Commits](https://github.com/trusche/httplog/commits/v1.3.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-05-21 15:41:15 +09:00
Thibaut Girka	6e227ecb04	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-18 10:04:32 +02:00
Thibaut Girka	94aef563b9	Add support for markdown-formatted toots	2019-05-17 23:51:14 +02:00
dependabot[bot]	e976a9dfbd	Bump aws-sdk-s3 from 1.38.0 to 1.39.0 (#10773 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.38.0 to 1.39.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.38.0...v1.39.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-05-17 15:23:21 +09:00
dependabot[bot]	2310dd40fa	Bump capybara from 3.19.1 to 3.20.0 (#10768 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.19.1 to 3.20.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.19.1...3.20.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-05-16 16:13:52 +09:00
dependabot[bot]	90093f1795	Bump aws-sdk-s3 from 1.36.1 to 1.38.0 (#10769 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.36.1 to 1.38.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.36.1...v1.38.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-05-16 15:00:24 +09:00
Thibaut Girka	6badf2d252	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-15 17:11:40 +02:00
dependabot[bot]	76901b65c4	Bump capybara from 3.18.0 to 3.19.1 (#10758 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.18.0 to 3.19.1. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.18.0...3.19.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-05-14 15:01:47 +09:00
dependabot[bot]	d90104204f	Bump rubocop from 0.68.1 to 0.69.0 (#10762 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.68.1 to 0.69.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.68.1...v0.69.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-05-14 15:00:58 +09:00
Thibaut Girka	68629f2773	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system	2019-05-10 17:09:12 +02:00
dependabot[bot]	7e73a8b8bf	Bump parallel_tests from 2.28.0 to 2.29.0 (#10716 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.28.0 to 2.29.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.28.0...v2.29.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-05-06 15:12:55 +09:00
Thibaut Girka	33c80e0783	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/media_attachment.rb	2019-05-04 16:37:26 +02:00
dependabot[bot]	ecbea2e3c6	Bump rack-attack from 5.4.2 to 6.0.0 (#10599 ) * Bump rack-attack from 5.4.2 to 6.0.0 Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 5.4.2 to 6.0.0. - [Release notes](https://github.com/kickstarter/rack-attack/releases) - [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md) - [Commits](https://github.com/kickstarter/rack-attack/compare/v5.4.2...v6.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * fix payload[:request]	2019-05-03 16:16:11 +02:00
dependabot[bot]	61e28b0ccc	Bump scss_lint from 0.57.1 to 0.58.0 (#10678 ) Bumps [scss_lint](https://github.com/sds/scss-lint) from 0.57.1 to 0.58.0. - [Release notes](https://github.com/sds/scss-lint/releases) - [Changelog](https://github.com/sds/scss-lint/blob/master/CHANGELOG.md) - [Commits](https://github.com/sds/scss-lint/compare/v0.57.1...v0.58.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-05-03 17:29:53 +09:00
dependabot[bot]	7c94b190c8	Bump bullet from 5.9.0 to 6.0.0 (#10635 ) Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.9.0 to 6.0.0. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/5.9.0...6.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-04-30 18:05:49 +02:00
dependabot[bot]	feff0fc9b2	Bump rubocop from 0.67.2 to 0.68.0 (#10654 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.67.2 to 0.68.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.67.2...v0.68.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-04-30 18:05:22 +02:00
Eugen Rochko	fba96c808d	Add blurhash (#10630 ) * Add blurhash * Use fallback color for spoiler when blurhash missing * Federate the blurhash and accept it as long as it's at most 5x5 * Display unknown media attachments as blurhash placeholders * Improve style of embed actions and spoiler button * Change blurhash resolution from 3x3 to 4x4 * Improve dependency definitions * Fix code style issues	2019-04-27 03:24:09 +02:00
Thibaut Girka	7783ec921b	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-24 15:25:22 +02:00
dependabot[bot]	db61383f82	Bump capybara from 3.17.0 to 3.18.0 (#10626 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.17.0 to 3.18.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.17.0...3.18.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-04-23 18:53:52 +09:00
dependabot[bot]	703cdf2a0c	Bump capybara from 3.16.2 to 3.17.0 (#10602 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.2 to 3.17.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.16.2...3.17.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-04-23 00:54:51 +02:00
Thibaut Girka	a9eaa780f5	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	2019-04-22 20:40:04 +02:00
dependabot[bot]	5c34163dbc	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>	2019-04-22 15:02:59 +02:00
dependabot[bot]	c9441bf82e	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>	2019-04-22 14:54:19 +02:00
dependabot[bot]	a5c0aae984	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>	2019-04-21 04:49:05 +02:00
Thibaut Girka	f5f6d23d55	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.	2019-04-08 15:57:56 +02:00
dependabot[bot]	fb8557e652	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>	2019-04-06 11:41:19 +09:00
Thibaut Girka	4444d8f9b3	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-30 12:36:24 +01:00
dependabot[bot]	3b1c64cadc	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>	2019-03-29 22:06:56 +09:00

... 3 4 5 6 7 ...

837 Commits