mastodon

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

Author	SHA1	Message	Date
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
Thibaut Girka	050efbc126	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml	2019-03-28 13:01:33 +01:00
dependabot[bot]	24d5b6f9e3	Bump aws-sdk-s3 from 1.35.0 to 1.36.0 (#10406 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.35.0 to 1.36.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.35.0...v1.36.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-28 16:25:27 +09:00
dependabot[bot]	85629bf3d3	Bump rails from 5.2.2.1 to 5.2.3 (#10407 ) Bumps [rails](https://github.com/rails/rails) from 5.2.2.1 to 5.2.3. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.2.1...v5.2.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-28 16:25:11 +09:00
dependabot[bot]	f46f67d984	[Security] Bump devise from 4.5.0 to 4.6.2 (#10394 ) Bumps [devise](https://github.com/plataformatec/devise) from 4.5.0 to 4.6.2. This update includes security fixes. - [Release notes](https://github.com/plataformatec/devise/releases) - [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/devise/compare/v4.5.0...v4.6.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-28 02:20:53 +01:00
dependabot[bot]	319bce3d9d	Bump tzinfo-data from 1.2018.9 to 1.2019.1 (#10396 ) Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2018.9 to 1.2019.1. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.9...v1.2019.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-27 17:45:31 +01:00
Thibaut Girka	b9f314bba7	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml	2019-03-26 16:02:54 +01:00
Thibaut Girka	fcce135d27	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/admin/settings_controller.rb - app/models/form/admin_settings.rb Conflicts caused by upstream refactoring, while we have flavours and skins, with the flavour_and_skin pseudo-setting.	2019-03-26 16:01:59 +01:00
dependabot[bot]	ac0cc692f5	Bump aws-sdk-s3 from 1.34.0 to 1.35.0 (#10369 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.34.0 to 1.35.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.34.0...v1.35.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-25 20:54:00 +01:00
dependabot[bot]	d23ff0c5c9	Bump aws-sdk-s3 from 1.33.0 to 1.34.0 (#10342 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.33.0 to 1.34.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.33.0...v1.34.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-22 22:42:59 +09:00
Thibaut Girka	edd5441112	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-22 13:05:17 +01:00
dependabot[bot]	88be18125e	Bump capybara from 3.14.0 to 3.15.0 (#10330 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.14.0 to 3.15.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.14.0...3.15.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-21 19:02:21 +09:00
Thibaut Girka	1d6152f440	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.	2019-03-20 13:54:00 +01:00
dependabot[bot]	941b0adcae	Bump aws-sdk-s3 from 1.32.0 to 1.33.0 (#10319 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.32.0 to 1.33.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.32.0...v1.33.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-19 16:34:21 +01:00
dependabot[bot]	c95e3a2e34	Bump rubocop from 0.65.0 to 0.66.0 (#10318 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.65.0 to 0.66.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.65.0...v0.66.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-19 16:34:04 +01:00
Thibaut Girka	291012ec0c	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/accounts_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/statuses_controller.rb All conflicts caused by the additional `use_pack` used for glitch-soc's theming system.	2019-03-18 18:03:27 +01:00
dependabot[bot]	f85b66eb8c	Bump brakeman from 4.4.0 to 4.5.0 (#10309 ) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.4.0 to 4.5.0. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v4.4.0...v4.5.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-18 14:41:44 +01:00
Thibaut Girka	4df3b7cb06	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up.	2019-03-16 14:14:20 +01:00
Yamagishi Kazutoshi	8347479f5d	Bump webpacker from 3.5.5 to 4.0.2 (#10277 ) Bumps [webpacker](https://github.com/rails/webpacker) from 3.5.5 to 4.0.2. - [Release notes](https://github.com/rails/webpacker/releases) - [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/webpacker/compare/v3.5.5...v4.0.2) Signed-off-by: dependabot[bot] <support@dependabot.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2019-03-15 15:05:31 +01:00
dependabot[bot]	5a9978f02a	Bump aws-sdk-s3 from 1.31.0 to 1.32.0 (#10279 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.31.0 to 1.32.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.31.0...v1.32.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-15 14:53:34 +01:00
Thibaut Girka	f3e7634156	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-11 17:31:02 +01:00
dependabot[bot]	c8122e84cc	Bump aws-sdk-s3 from 1.30.1 to 1.31.0 (#10236 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.30.1 to 1.31.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.30.1...1.31.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-11 15:29:07 +01:00
Thibaut Girka	4806232997	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-06 11:29:06 +01:00
dependabot[bot]	ad6f7ea250	Bump active_record_query_trace from 1.5.4 to 1.6 (#10192 ) Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace) from 1.5.4 to 1.6. - [Release notes](https://github.com/brunofacca/active-record-query-trace/releases) - [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/v1.6/HISTORY.md) - [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.5.4...v1.6) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-06 14:58:13 +09:00
Thibaut Girka	2267eee356	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-28 21:35:53 +01:00
dependabot[bot]	34315fcda5	Bump capybara from 3.13.2 to 3.14.0 (#10119 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.13.2 to 3.14.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.13.2...3.14.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-02-27 15:02:57 +01:00
Thibaut Girka	0158937fc2	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - Dockerfile Took upstream version and reverted `f13ebd02c9`. Hopefuly it's not needed anymore. - app/controllers/api/v1/search_controller.rb The conflict was due to us raising the number of results returned. Upstream raised it further, so took it. - config/locales/de.yml Took upstream changes to theme translation strings. - config/locales/gl.yml Took upstream changes to theme translation strings. - config/locales/nl.yml Took upstream changes to theme translation strings. - config/locales/sk.yml Took upstream changes to theme translation strings.	2019-02-26 17:04:44 +01:00
dependabot[bot]	775e835ed6	Bump rubocop from 0.64.0 to 0.65.0 (#10112 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.64.0 to 0.65.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.64.0...v0.65.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-02-25 15:56:35 +01:00
dependabot[bot]	c07e59031f	Bump dotenv-rails from 2.6.0 to 2.7.1 (#10114 ) Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.6.0 to 2.7.1. - [Release notes](https://github.com/bkeepers/dotenv/releases) - [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md) - [Commits](https://github.com/bkeepers/dotenv/compare/v2.6.0...v2.7.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-02-25 15:55:53 +01:00
dependabot[bot]	4532833498	Bump pry-byebug from 3.6.0 to 3.7.0 (#10098 ) Bumps [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug) from 3.6.0 to 3.7.0. - [Release notes](https://github.com/deivid-rodriguez/pry-byebug/releases) - [Changelog](https://github.com/deivid-rodriguez/pry-byebug/blob/master/CHANGELOG.md) - [Commits](https://github.com/deivid-rodriguez/pry-byebug/compare/v3.6.0...v3.7.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-02-22 20:06:01 +09:00
Thibaut Girka	06cc04fd23	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-15 18:02:45 +01:00
dependabot[bot]	3d374ed18b	Bump bootsnap from 1.3.2 to 1.4.0 (#10022 ) Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.3.2 to 1.4.0. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.3.2...v1.4.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-02-13 02:55:06 +01:00
Thibaut Girka	0e34e91661	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-12 20:32:48 +01:00
dependabot[bot]	241661e009	Bump rubocop from 0.63.1 to 0.64.0 (#10006 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.63.1 to 0.64.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.63.1...v0.64.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-02-12 05:11:06 +01:00
Thibaut Girka	bf94a43496	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.	2019-02-10 21:10:09 +01:00
dependabot[bot]	3031b8a8f2	Bump parallel_tests from 2.27.1 to 2.28.0 (#9985 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.27.1 to 2.28.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.27.1...v2.28.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-02-10 18:17:34 +01:00
dependabot[bot]	e28fe2ef26	Bump microformats from 4.0.7 to 4.1.0 (#9980 ) Bumps [microformats](https://github.com/microformats/microformats-ruby) from 4.0.7 to 4.1.0. - [Release notes](https://github.com/microformats/microformats-ruby/releases) - [Commits](https://github.com/microformats/microformats-ruby/compare/v4.0.7...v4.1.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-02-06 16:46:37 +01:00
dependabot[bot]	c5071f2d78	Bump capybara from 3.12.0 to 3.13.2 (#9935 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.12.0 to 3.13.2. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.12.0...3.13.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-02-03 03:40:40 +01:00
Thibaut Girka	04e2c67389	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-25 11:37:49 +01:00
dependabot[bot]	c30287cf7c	Bump addressable from 2.5.2 to 2.6.0 (#9888 ) Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.5.2 to 2.6.0. - [Release notes](https://github.com/sporkmonger/addressable/releases) - [Changelog](https://github.com/sporkmonger/addressable/blob/master/CHANGELOG.md) - [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.5.2...addressable-2.6.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-01-21 21:38:00 +09:00
Thibaut Girka	5e0cf92fd1	Merge branch 'master' into glitch-soc/merge-upstream No conflicts.	2019-01-19 18:28:37 +01:00
dependabot[bot]	bf31f394fb	Bump json-ld from 2.2.1 to 3.0.2 (#8804 ) Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 2.2.1 to 3.0.2. - [Release notes](https://github.com/ruby-rdf/json-ld/releases) - [Commits](https://github.com/ruby-rdf/json-ld/compare/2.2.1...3.0.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-01-18 16:02:29 +01:00
dependabot[bot]	f424e99e46	Bump brakeman from 4.3.1 to 4.4.0 (#9848 ) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.3.1 to 4.4.0. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v4.3.1...v4.4.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-01-18 15:57:41 +01:00
dependabot[bot]	451ae6896d	Bump rubocop from 0.62.0 to 0.63.0 (#9827 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.62.0 to 0.63.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.62.0...v0.63.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-01-17 22:21:32 +09:00
Thibaut Girka	dbe311f0e9	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/locales/simple_form.pl.yml	2019-01-16 14:20:07 +01:00
Eugen Rochko	ee5e24807f	Add `tootctl domains crawl` (#9809 )	2019-01-15 09:24:35 +01:00
dependabot[bot]	5ac425ad28	Bump sidekiq-unique-jobs from 5.0.10 to 6.0.8 (#9801 ) Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 5.0.10 to 6.0.8. - [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases) - [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md) - [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v5.0.10...v6.0.8) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-01-14 09:18:55 +00:00
dependabot[bot]	944de8a6c9	Bump dotenv-rails from 2.5.0 to 2.6.0 (#9803 ) Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.5.0 to 2.6.0. - [Release notes](https://github.com/bkeepers/dotenv/releases) - [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md) - [Commits](https://github.com/bkeepers/dotenv/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-01-14 09:13:34 +00:00
Thibaut Girka	a2a64ecd3e	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.	2019-01-10 21:00:30 +01:00
dependabot[bot]	b418ef5ba8	Bump nokogiri from 1.9.1 to 1.10.0 (#9757 ) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.9.1 to 1.10.0. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.9.1...v1.10.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-01-08 14:10:30 +01:00
dependabot[bot]	1c23124ba4	Bump rubocop from 0.61.1 to 0.62.0 (#9702 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.61.1 to 0.62.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.61.1...v0.62.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-01-03 08:22:01 +01:00
dependabot[bot]	dd43cbdf25	Bump httplog from 1.1.1 to 1.2.0 (#9681 ) Bumps [httplog](https://github.com/trusche/httplog) from 1.1.1 to 1.2.0. - [Release notes](https://github.com/trusche/httplog/releases) - [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md) - [Commits](https://github.com/trusche/httplog/compare/v1.1.1...v1.2.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-01-02 22:39:02 +01:00
Thibaut Girka	571d219bb9	Merge branch 'master' into glitch-soc/merge-upstream Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock	2019-01-02 15:36:53 +01:00
ashleyhull-versent	29484f6555	Replace Ruby 2.3 with 2.6 in CircleCI (#9652 ) * Update config.yml * Update Gemfile * dropping ruby 2.3 2.3 EOL date: scheduled for 2019-03-31 * Updating docker containers * Update Gemfile	2018-12-29 07:23:07 +01:00
dependabot[bot]	17cd443b37	Bump webmock from 3.4.2 to 3.5.1 (#9641 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.4.2 to 3.5.1. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.4.2...v3.5.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-27 12:23:27 +01:00
dependabot[bot]	8be0843467	Bump cld3 from 3.2.2 to 3.2.3 (#9632 ) Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.2 to 3.2.3. - [Release notes](https://github.com/akihikodaki/cld3-ruby/releases) - [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.2...v3.2.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-26 06:39:17 +01:00
Thibaut Girka	034ffc079e	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.	2018-12-18 16:55:15 +01:00
dependabot[bot]	071eb0e202	Bump nokogiri from 1.8.5 to 1.9.1 (#9557 ) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.5 to 1.9.1. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.5...v1.9.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-18 16:41:41 +01:00
dependabot[bot]	bfd0ebf925	Bump omniauth from 1.8.1 to 1.9.0 (#9544 ) Bumps [omniauth](https://github.com/omniauth/omniauth) from 1.8.1 to 1.9.0. - [Release notes](https://github.com/omniauth/omniauth/releases) - [Commits](https://github.com/omniauth/omniauth/compare/v1.8.1...v1.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-17 10:15:14 +01:00
Thibaut Girka	65e994b29b	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.	2018-12-15 10:45:53 +01:00
dependabot[bot]	fcc35f6ec1	Bump aws-sdk-s3 from 1.27.0 to 1.30.0 (#9429 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.27.0 to 1.30.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-14 20:37:29 +01:00
dependabot[bot]	7241db299c	Bump redis from 4.0.3 to 4.1.0 (#9520 ) Bumps [redis](https://github.com/redis/redis-rb) from 4.0.3 to 4.1.0. - [Release notes](https://github.com/redis/redis-rb/releases) - [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/redis-rb/compare/v4.0.3...v4.1.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-14 06:52:06 +01:00
dependabot[bot]	a48fe52375	Bump letter_opener from 1.6.0 to 1.7.0 (#9493 ) Bumps [letter_opener](https://github.com/ryanb/letter_opener) from 1.6.0 to 1.7.0. - [Release notes](https://github.com/ryanb/letter_opener/releases) - [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md) - [Commits](https://github.com/ryanb/letter_opener/compare/v1.6.0...v1.7.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-11 14:34:02 +09:00
dependabot[bot]	f1041637ff	Bump json-ld-preloaded from 2.2.3 to 3.0.0 (#9416 ) Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 2.2.3 to 3.0.0. - [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases) - [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/2.2.3...3.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-11 05:40:01 +01:00
Thibaut Girka	1df392819d	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-06 12:44:38 +01:00
dependabot[bot]	d5245434ec	Bump rails from 5.2.1.1 to 5.2.2 (#9430 ) Bumps [rails](https://github.com/rails/rails) from 5.2.1.1 to 5.2.2. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.1.1...v5.2.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-06 16:10:18 +09:00
dependabot[bot]	c73c463478	Bump rubocop from 0.60.0 to 0.61.0 (#9439 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.60.0 to 0.61.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.60.0...v0.61.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-06 16:08:54 +09:00
dependabot[bot]	a61ce1c947	Bump capybara from 3.11.1 to 3.12.0 (#9388 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.11.1 to 3.12.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.11.1...3.12.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-04 09:27:17 +09:00
Thibaut Girka	d32d33f408	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-02 20:29:14 +01:00
ThibG	84e5ed43e7	Preload common JSON-LD contexts (#9412 ) Fixes #9411	2018-12-02 16:46:13 +01:00
Thibaut Girka	ad7a3974cc	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-29 19:22:52 +01:00
dependabot[bot]	6fac300ea4	Bump aws-sdk-s3 from 1.25.0 to 1.27.0 (#9385 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.25.0 to 1.27.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-28 16:34:53 +01:00
Thibaut Girka	f8e07ca5cd	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).	2018-11-27 13:23:02 +01:00
dependabot[bot]	d5fac45f5b	Bump tty-prompt from 0.17.2 to 0.18.0 (#9354 ) Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.17.2 to 0.18.0. - [Release notes](https://github.com/piotrmurach/tty-prompt/releases) - [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md) - [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.17.2...v0.18.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-27 12:27:00 +01:00
dependabot[bot]	0206d569c3	Bump simple_form from 4.0.1 to 4.1.0 (#9331 ) Bumps [simple_form](https://github.com/plataformatec/simple_form) from 4.0.1 to 4.1.0. - [Release notes](https://github.com/plataformatec/simple_form/releases) - [Changelog](https://github.com/plataformatec/simple_form/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/simple_form/compare/v4.0.1...v4.1.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-23 14:29:59 +09:00
dependabot[bot]	473998ca27	Bump sidekiq-bulk from 0.1.1 to 0.2.0 (#9306 ) Bumps [sidekiq-bulk](https://github.com/aprescott/sidekiq-bulk) from 0.1.1 to 0.2.0. - [Release notes](https://github.com/aprescott/sidekiq-bulk/releases) - [Changelog](https://github.com/aprescott/sidekiq-bulk/blob/master/CHANGES.md) - [Commits](https://github.com/aprescott/sidekiq-bulk/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-22 12:47:36 +01:00
dependabot[bot]	c100e82a56	Bump aws-sdk-s3 from 1.24.0 to 1.25.0 (#9321 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.24.0 to 1.25.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-22 12:47:14 +01:00
dependabot[bot]	367ad21995	Bump aws-sdk-s3 from 1.23.1 to 1.24.0 (#9289 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.23.1 to 1.24.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-16 11:19:09 +01:00
dependabot[bot]	96165a29ba	Bump capybara from 3.10.1 to 3.11.0 (#9285 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.10.1 to 3.11.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.10.1...3.11.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-15 14:49:06 +09:00
Thibaut Girka	bfe2b9cc50	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-13 16:28:07 +01:00
dependabot[bot]	c81bdafb07	Bump parallel_tests from 2.26.2 to 2.27.0 (#9263 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.26.2 to 2.27.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.26.2...v2.27.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-12 12:50:48 +01:00
dependabot[bot]	fe57d73e4c	Bump bullet from 5.8.1 to 5.9.0 (#9264 ) Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.8.1 to 5.9.0. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/5.8.1...5.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-12 12:49:51 +01:00
Thibaut Girka	9201398507	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-09 14:56:31 +01:00
dependabot[bot]	f055907857	Bump bullet from 5.7.6 to 5.8.1 (#9156 ) Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.7.6 to 5.8.1. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/5.7.6...5.8.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-08 21:15:33 +01:00
Thibaut Girka	94ad76a5b9	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-30 11:22:25 +01:00
dependabot[bot]	6771e8c88c	Bump oj from 3.6.12 to 3.7.0 (#9155 ) Bumps [oj](https://github.com/ohler55/oj) from 3.6.12 to 3.7.0. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.6.12...v3.7.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-30 06:39:52 +01:00
Eugen Rochko	d4415cc316	Bump i18n-tasks from master to 0.9.28 (#9148 )	2018-10-30 01:06:47 +01:00
Thibaut Girka	f16d66c5c8	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-29 14:09:54 +01:00
Eugen Rochko	b40ea6d1d4	Bump sanitize from 4.6.6 to 5.0.0 (#9140 )	2018-10-29 14:05:25 +01:00
Thibaut Girka	a942ad3062	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/locales/simple_form.ja.yml Not a real conflict, one new string was introduced in glitch and one in upstream.	2018-10-29 14:00:41 +01:00
Eugen Rochko	32f950a7a8	Update i18n-tasks to master (#9139 )	2018-10-29 13:46:39 +01:00
dependabot[bot]	ce33ce94c9	Bump parallel_tests from 2.25.0 to 2.26.0 (#9137 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.25.0 to 2.26.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.25.0...v2.26.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-29 12:55:55 +01:00
dependabot[bot]	3b89abc343	Bump rubocop from 0.59.2 to 0.60.0 (#9135 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.59.2 to 0.60.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.59.2...v0.60.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-29 12:55:16 +01:00
Thibaut Girka	b00f60f1d3	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-28 08:37:49 +01:00
Eugen Rochko	26fe37c414	Update i18n-tasks and change CircleCI command (#9104 ) * Update i18n-tasks and CircleCI command * Fix #9088 * Update i18n-tasks * Fix ast	2018-10-28 07:15:20 +01:00
Thibaut Girka	5bb8563f6c	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.	2018-10-26 20:41:43 +02:00
dependabot[bot]	98b4cdf198	Bump parallel_tests from 2.24.0 to 2.25.0 (#9090 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.24.0 to 2.25.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.24.0...v2.25.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-25 08:29:25 +02:00
dependabot[bot]	4e6cffe00c	Bump aws-sdk-s3 from 1.21.0 to 1.23.0 (#9089 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.21.0 to 1.23.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-25 08:29:12 +02:00
Eugen Rochko	df3a7e724d	Fix missing plural keys (#9084 ) * Update i18n-tasks to feature-missing-plural-keys * Fix pluralizations with missing keys in Arabic Fix #8554 * Add i18n-tasks missing-plural-keys to CircleCI	2018-10-25 00:09:45 +02:00
dependabot[bot]	9f3283086f	Bump capybara from 3.9.0 to 3.10.0 (#9077 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.9.0 to 3.10.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.9.0...3.10.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-24 23:22:18 +09:00
Thibaut Girka	8f3096b846	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-23 17:15:57 +02:00
dependabot[bot]	65867b6e61	Bump parallel_tests from 2.23.0 to 2.24.0 (#9064 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.23.0 to 2.24.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.23.0...v2.24.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-23 08:17:26 +02:00
Thibaut Girka	dcded13a99	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.	2018-10-22 17:51:38 +02:00
Eugen Rochko	4f0bdbaaaf	Downgrade fog-openstack to 0.3.7 and fog-core to 2.1.0 (#9049 ) Fix #8889	2018-10-22 16:58:36 +02:00
dependabot[bot]	8b0a980e28	Bump strong_migrations from 0.2.3 to 0.3.0 (#8991 ) Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.2.3 to 0.3.0. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.2.3...v0.3.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-16 07:50:09 +02:00
dependabot[bot]	734d55c3cf	Bump pundit from 1.1.0 to 2.0.0 (#8873 ) Bumps [pundit](https://github.com/varvet/pundit) from 1.1.0 to 2.0.0. - [Release notes](https://github.com/varvet/pundit/releases) - [Changelog](https://github.com/varvet/pundit/blob/master/CHANGELOG.md) - [Commits](https://github.com/varvet/pundit/compare/v1.1.0...v2.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-12 22:48:16 +02:00
Thibaut Girka	8f720be9f3	Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream	2018-10-11 14:12:36 +02:00
dependabot[bot]	ac7df62a04	Bump better_errors from 2.4.0 to 2.5.0 (#8946 ) Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.4.0 to 2.5.0. - [Release notes](https://github.com/BetterErrors/better_errors/releases) - [Changelog](https://github.com/BetterErrors/better_errors/blob/master/CHANGELOG.md) - [Commits](https://github.com/BetterErrors/better_errors/compare/v2.4.0...v2.5.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-10 19:36:41 +02:00
Thibaut Girka	a02244f17c	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/javascript/packs/public.js Changes made to app/javascript/packs/publics.js were applied to app/javascript/core/settings.js	2018-10-09 21:08:26 +02:00
dependabot[bot]	46e4a759bb	Bump capistrano-rails from 1.3.1 to 1.4.0 (#8936 ) Bumps [capistrano-rails](https://github.com/capistrano/rails) from 1.3.1 to 1.4.0. - [Release notes](https://github.com/capistrano/rails/releases) - [Changelog](https://github.com/capistrano/rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/capistrano/rails/compare/v1.3.1...v1.4.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-09 19:43:26 +02:00
dependabot[bot]	076ceffa84	Bump dotenv-rails from 2.2.2 to 2.5.0 (#8934 ) Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.2.2 to 2.5.0. - [Release notes](https://github.com/bkeepers/dotenv/releases) - [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md) - [Commits](https://github.com/bkeepers/dotenv/compare/v2.2.2...v2.5.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-09 19:43:05 +02:00
dependabot[bot]	d4b7d75968	Bump faker from 1.8.7 to 1.9.1 (#8935 ) Bumps [faker](https://github.com/stympy/faker) from 1.8.7 to 1.9.1. - [Release notes](https://github.com/stympy/faker/releases) - [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/stympy/faker/compare/v1.8.7...v1.9.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-09 19:59:34 +09:00
Thibaut Girka	d17844e6d1	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
dependabot[bot]	4c4ff05a46	Bump capybara from 3.8.2 to 3.9.0 (#8924 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.8.2 to 3.9.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.8.2...3.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-08 07:45:31 +02:00
dependabot[bot]	10e38b441f	Bump aws-sdk-s3 from 1.20.0 to 1.21.0 (#8926 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.20.0 to 1.21.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-08 07:44:53 +02:00
Thibaut Girka	611740ce81	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-07 19:47:56 +02:00
Eugen Rochko	30dd7f3d90	Remove unused ruby-progressbar dependency (#8896 ) * Remove unused ruby-progressbar dependency * Remove unused colorize dependency	2018-10-06 08:33:26 +09:00
Thibaut Girka	98bb6815a7	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-05 21:48:25 +02:00
dependabot[bot]	6812f811b1	Bump parallel_tests from 2.21.3 to 2.23.0 (#8884 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.21.3 to 2.23.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.21.3...v2.23.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-05 18:59:35 +02:00
dependabot[bot]	7c154c6afd	Bump puma from 3.11.4 to 3.12.0 (#8883 ) Bumps [puma](https://github.com/puma/puma) from 3.11.4 to 3.12.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v3.11.4...v3.12.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-05 18:58:13 +02:00
Thibaut Girka	00fcdebed7	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.	2018-10-05 15:23:57 +02:00
dependabot[bot]	da8abef56d	Bump fog-openstack, rspec-rails and fog-core (#8877 ) Bumps [fog-openstack](https://github.com/fog/fog-openstack), [rspec-rails](https://github.com/rspec/rspec-rails) and [fog-core](https://github.com/fog/fog-core). These dependencies needed to be updated together. Updates `fog-openstack` from 0.3.6 to 1.0.3 - [Release notes](https://github.com/fog/fog-openstack/releases) - [Changelog](https://github.com/fog/fog-openstack/blob/master/CHANGELOG.md) - [Commits](https://github.com/fog/fog-openstack/compare/v0.3.6...v1.0.3) Updates `rspec-rails` from 3.7.2 to 3.8.0 - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v3.7.2...v3.8.0) Updates `fog-core` from 1.45.0 to 2.1.2 - [Release notes](https://github.com/fog/fog-core/releases) - [Changelog](https://github.com/fog/fog-core/blob/master/changelog.md) - [Commits](https://github.com/fog/fog-core/compare/v1.45.0...v2.1.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-04 15:35:18 +02:00
dependabot[bot]	928102284a	Bump webmock from 3.3.0 to 3.4.2 (#8874 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.3.0 to 3.4.2. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.3.0...v3.4.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-04 12:34:17 +02:00
dependabot[bot]	10f7916f37	Bump fuubar from 2.3.1 to 2.3.2 (#8875 ) Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.3.1 to 2.3.2. - [Release notes](https://github.com/thekompanee/fuubar/releases) - [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md) - [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.3.1...releases/v2.3.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-04 12:33:02 +02:00
dependabot[bot]	b70de2cf69	Bump http from 3.2.0 to 3.3.0 (#8871 ) Bumps [http](https://github.com/httprb/http) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/httprb/http/releases) - [Changelog](https://github.com/httprb/http/blob/master/CHANGES.md) - [Commits](https://github.com/httprb/http/compare/v3.2.0...v3.3.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-04 12:32:26 +02:00
dependabot[bot]	ebb3631216	Bump brakeman from 4.2.1 to 4.3.1 (#8872 ) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.2.1 to 4.3.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.2.1...v4.3.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-04 12:31:22 +02:00
dependabot[bot]	ad459ab837	Bump fog-openstack from 0.1.25 to 0.3.6 (#8860 ) Bumps [fog-openstack](https://github.com/fog/fog-openstack) from 0.1.25 to 0.3.6. - [Release notes](https://github.com/fog/fog-openstack/releases) - [Changelog](https://github.com/fog/fog-openstack/blob/master/CHANGELOG.md) - [Commits](https://github.com/fog/fog-openstack/compare/v0.1.25...v0.3.6) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-04 01:07:13 +02:00
dependabot[bot]	941c9d0d42	Bump aws-sdk-s3 from 1.9.1 to 1.20.0 (#8848 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.9.1 to 1.20.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-04 01:06:54 +02:00
dependabot[bot]	3b6ab82db7	Bump capybara from 2.18.0 to 3.8.2 (#8858 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 2.18.0 to 3.8.2. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/2.18.0...3.8.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-03 15:24:48 +02:00
dependabot[bot]	730f196b96	Bump pg from 1.0.0 to 1.1.3 (#8856 ) Bumps [pg](https://bitbucket.org/ged/ruby-pg) from 1.0.0 to 1.1.3. - [Changelog](https://bitbucket.org/ged/ruby-pg/src/master/History.rdoc) - [Commits](https://bitbucket.org/ged/ruby-pg/branches/compare/v1.1.3..v1.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-03 15:20:56 +02:00
dependabot[bot]	53275b949e	Bump httplog from 1.0.2 to 1.1.1 (#8839 ) Bumps [httplog](https://github.com/trusche/httplog) from 1.0.2 to 1.1.1. - [Release notes](https://github.com/trusche/httplog/releases) - [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md) - [Commits](https://github.com/trusche/httplog/compare/v1.0.2...v1.1.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-03 04:56:00 +02:00
dependabot[bot]	3f62b119e4	Bump rubocop from 0.55.0 to 0.59.2 (#8849 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.55.0 to 0.59.2. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.55.0...v0.59.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-02 20:16:51 +02:00
dependabot[bot]	194ad2c90b	Bump rack-attack from 5.2.0 to 5.4.1 (#8838 ) Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 5.2.0 to 5.4.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/v5.2.0...v5.4.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-01 22:49:26 +02:00
Grey Baker	3a2f007eb0	Promote colorize to top-level dependency (#8844 )	2018-10-02 05:34:25 +09:00
Thibaut Girka	24d05c7a50	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 14:36:06 +02:00
dependabot[bot]	746da5ccda	Bump ox from 2.9.2 to 2.10.0 (#8837 ) Bumps [ox](https://github.com/ohler55/ox) from 2.9.2 to 2.10.0. - [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.9.2...v2.10.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-01 14:08:33 +02:00
Thibaut Girka	c91d9b7389	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb	2018-10-01 12:43:20 +02:00
Eugen Rochko	e09301f414	Adjust bootsnap configuration for newer version (#8826 )	2018-09-29 18:34:36 +02:00
dependabot[bot]	5da51771cd	Bump oj from 3.5.1 to 3.6.11 (#8815 ) Bumps [oj](https://github.com/ohler55/oj) from 3.5.1 to 3.6.11. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.5.1...v3.6.11) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-09-28 13:34:31 +02:00
dependabot[bot]	e046a987f6	Bump capistrano from 3.10.2 to 3.11.0 (#8801 ) Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.10.2 to 3.11.0. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Changelog](https://github.com/capistrano/capistrano/blob/master/CHANGELOG.md) - [Commits](https://github.com/capistrano/capistrano/compare/v3.10.2...v3.11.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-09-27 18:24:06 +02:00
dependabot[bot]	7efa3d02c7	Bump sidekiq-scheduler from 2.2.1 to 3.0.0 (#8789 ) Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler) from 2.2.1 to 3.0.0. - [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases) - [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v2.2.1...v3.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-09-27 02:11:21 +09:00
dependabot[bot]	65e7c6d9b5	Bump tty-prompt from 0.16.0 to 0.17.0 (#8791 ) Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.16.0 to 0.17.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.16.0...v0.17.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-09-27 02:02:38 +09:00
Grey Baker	6e075b9cc4	Bump devise from 4.4.3 to 4.5.0 (#8778 ) Bumps [devise](https://github.com/plataformatec/devise) from 4.4.3 to 4.5.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.4.3...v4.5.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-09-26 04:27:53 +09:00
dependabot[bot]	8096df1055	Bump sidekiq from 5.1.3 to 5.2.2 (#8779 ) Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.1.3 to 5.2.2. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v5.1.3...v5.2.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-09-25 20:33:00 +02:00
dependabot[bot]	29e2d9e1b7	Bump mime-types from 3.1 to 3.2.2 (#8781 ) Bumps [mime-types](https://github.com/mime-types/ruby-mime-types) from 3.1 to 3.2.2. - [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.1...v3.2.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-09-25 20:32:37 +02:00
dependabot[bot]	a7f75485d1	Bump pghero from 2.1.0 to 2.2.0 (#8782 ) Bumps [pghero](https://github.com/ankane/pghero) from 2.1.0 to 2.2.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.1.0...v2.2.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-09-25 20:31:40 +02:00
Eugen Rochko	56efc28189	Update ruby dependencies (#8743 ) * Update ffi to 1.9.25 * Update private_address_check to 0.5.0	2018-09-21 00:42:59 +02:00
Thibaut Girka	91bef4759f	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js	2018-09-19 21:46:01 +02:00
Yamagishi Kazutoshi	0ddbccf7e6	Upgrade Babel to version 7.0.0 (#5925 )	2018-09-14 17:59:48 +02:00
Alexander	64a5561b5a	update devise_pam_authenticatable2, new feature: pam gets ip address of client (#8623 )	2018-09-14 17:42:45 +02:00
Thibaut Girka	53b7bb9d04	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml	2018-08-27 18:09:28 +02:00
Eugen Rochko	c597249124	Add thor to Gemfile directly (#8467 ) It's a common dependency, but just in case	2018-08-26 20:02:32 +02:00
Thibaut Girka	36393e1d2b	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.	2018-08-26 14:23:24 +02:00
Eugen Rochko	b37ae64578	Upgrade Doorkeeper to 5.0.0 (#8409 ) See doorkeeper-gem/doorkeeper#1137	2018-08-24 18:17:11 +02:00
Thibaut Girka	8b4abaa90d	Merge branch 'master' into glitch-soc/master Conflicts: config/routes.rb Added the “endorsements” route from upstream.	2018-08-21 18:24:48 +02:00
ThibG	f06fa09962	Revert to using Paperclip's filesystem storage, and fix dangling records in remove_remote (#8339 ) * Fix uncaching worker * Revert to using Paperclip's filesystem backend instead of fog-local fog-local has lots of concurrency issues, causing failure to delete files, dangling file records, and spurious errors UncacheMediaWorker	2018-08-21 17:53:01 +02:00
ThibG	8ac5e651e1	Upgrade doorkeeper to 4.4.2 (#8321 )	2018-08-20 22:42:02 +02:00
Thibaut Girka	88a0395a58	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-19 09:27:18 +02:00
AkiraFukushima	58ffe3f7c3	Revert "Upgrade Doorkeeper to 4.4.1 (#8197 )" (#8231 ) * Revert "Upgrade Doorkeeper to 4.4.1 (#8197)" This reverts commit `464daffdf9`. * Except migration files from revert commit	2018-08-19 03:20:37 +02:00
Eugen Rochko	c6eab9e0aa	Add Makara dependency to support read-replicas (#8216 ) Not active by default unless config/database.yml is edited	2018-08-18 21:06:12 +02:00
Eugen Rochko	464daffdf9	Upgrade Doorkeeper to 4.4.1 (#8197 )	2018-08-14 20:24:47 +02:00
S.H	5f41bbd274	Update Rails (#8141 ) * Update Rails * fix Update Rails	2018-08-13 18:17:20 +02:00
S.H	2aeeffc3ec	Update Rails (#8141 ) * Update Rails * fix Update Rails	2018-08-12 12:25:23 +02:00
Thibaut Girka	db200226b8	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…	2018-06-15 20:51:39 +02:00
Eugen Rochko	53f0452b70	Remove rack-timeout (#7809 ) Timeout considered harmful due to leaving the app in a broken state, including unreaped database connections	2018-06-15 19:46:25 +02:00
Thibaut Girka	b481e4fac1	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: config/locales/simple_form.ja.yml	2018-05-19 22:41:10 +02:00
MIYAGI Hikaru	0b1f88cfd5	Upgrade posix-spawn to master (#7542 )	2018-05-19 02:20:43 +02:00
Thibaut Girka	78ac246b87	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: Gemfile Solved conflicts by using upstream's line for posix-spawn	2018-05-16 21:52:38 +02:00
MIYAGI Hikaru	6bed372ad2	Fix posix-spawn to version 0.3.12 (#7517 ) Because 0.3.13 causes build error in x86 or other ILP32 environments. closes #7453	2018-05-16 16:52:19 +02:00
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	2018-05-14 20:51:50 +02:00
Yamagishi Kazutoshi	f77b11cd10	Update http_parser.rb to head version (#7467 )	2018-05-13 11:32:46 +02:00
Yamagishi Kazutoshi	4d706f9976	Downgrade doorkeeper to version 4.2.6 (#7456 ) ref https://github.com/doorkeeper-gem/doorkeeper/pull/1060	2018-05-12 12:08:12 +02:00
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	2018-05-10 00:03:28 +02:00
Yamagishi Kazutoshi	8c35d163a5	Port travis_retry for CI (#7379 ) * Port travis_retry for CI * Add license	2018-05-06 10:55:50 +02:00
David Yip	54e80bec73	Remove duplicate posix-spawn entry from Gemfile.	2018-05-04 10:11:45 -05:00
David Yip	e41332c37b	Make posix-spawn spec in Gemfile match what's in Gemfile.lock.	2018-05-04 09:51:18 -05:00
David Yip	77a92d3260	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: Gemfile.lock	2018-05-04 09:42:31 -05:00
Eugen Rochko	a78b27c7cc	Marginally improve convert/ffmpeg calls performance with posix-spawn (#7346 )	2018-05-04 13:22:23 +02:00
David Yip	c816701550	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml	2018-05-03 17:23:44 -05:00
Shuhei Kitagawa	ab773e4d5f	Add pry-byebug (#7307 )	2018-05-03 12:08:54 +02:00
Eugen Rochko	cb5b5cb5f7	Slightly reduce RAM usage (#7301 ) * No need to re-require sidekiq plugins, they are required via Gemfile * Add derailed_benchmarks tool, no need to require TTY gems in Gemfile * Replace ruby-oembed with FetchOEmbedService Reduce startup by 45382 allocated objects * Remove preloaded JSON-LD in favour of caching HTTP responses Reduce boot RAM by about 6 MiB * Fix tests * Fix test suite by stubbing out JSON-LD contexts	2018-05-02 18:58:48 +02:00
Yamagishi Kazutoshi	9613a53cb3	Update dependencies for Ruby (2018-04-23) (#7237 ) * Update annotate to version 2.7.3 * Update aws-sdk-s3 to version 1.9.2 * Update browser to version 2.5.3 * Update capistrano to version 3.10.2 * Update domain_name to version 0.5.20180417 * Update http to version 3.2.0 * Update lograge to version 0.10.0 * Update oj to version 3.5.1 * Update parallel_tests to version 2.21.3 * Update puma to version 3.11.4 * Update rubocop to version 0.55.0 * Update scss_lint to version 0.57.0 * Update simplecov to version 0.16.1 * Update tty-command to version 0.8.0 * Update tty-prompt to version 0.16.0 * Update pkg-config to version 1.3.0 * Update fog-local to version 0.5.0 * Update fog-openstack to version 0.1.25 * Update devise-two-factor to version 3.0.3 * bundle update	2018-04-23 11:29:17 +02:00
Yamagishi Kazutoshi	b438224751	Introduce rspec-retry (#7206 )	2018-04-20 19:31:30 +02:00
David Yip	ed490b781f	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: Gemfile.lock config/application.rb	2018-04-13 16:36:46 -05:00
Yamagishi Kazutoshi	50529cbceb	Upgrade Rails to version 5.2.0 (#5898 )	2018-04-12 14:45:17 +02:00
David Yip	a817f084ea	Merge remote-tracking branch 'tootsuite/master' Conflicts: app/controllers/statuses_controller.rb	2018-04-12 03:30:57 -05:00
Alexander	8e88a18316	update gem, test pam authentication (#7028 ) * update gem, test pam authentication * add description for test parameters * fix inclusion of optional group	2018-04-11 21:40:38 +02:00
David Yip	67e77f230e	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.	2018-04-08 19:05:02 -05:00
Eugen Rochko	d4de2239b0	Add a circuit breaker for ActivityPub deliveries (#7053 )	2018-04-07 21:36:58 +02:00
Jenkins	f0bb3ff533	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-30 19:17:17 +00:00
Pierre-Morgan Gate	47cee7cc8e	Upgrade charlock_holmes to version 0.7.6 (#6966 ) This version fixes compilation errors when trying to build its native extension with ICU 61.	2018-03-30 09:52:44 +02:00
Jenkins	837b3804bf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-25 15:17:21 +00:00
Yamagishi Kazutoshi	28384c1771	Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807 )" (#6808 ) This reverts commit `40871caa4b`.	2018-03-24 12:52:45 +01:00
Jenkins	6290cd7969	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-21 17:17:20 +00:00
Patrick Figel	d97903a358	Update sanitize and loofah (#6855 ) Fixes CVE-2018-8048 and CVE-2018-3740, two medium-severity XSS vulnerabilities present in these gems when built against libxml2 >= 2.9.2.	2018-03-21 17:43:28 +01:00
Jenkins	df70571bfe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-19 20:17:18 +00:00
Alexander	0306e3e9be	bugfixes and gem update (#6831 ) * update to new version of devise_pam_authenticatable2 * fix behaviour if suffix is nil, fix environment loading, fix user email creation * code cleanup/fix linter warning	2018-03-19 20:08:56 +01:00
Eugen Rochko	40871caa4b	Revert "Upgrade Paperclip to version 6.0.0" (#6807 ) * Revert "Bump version to 2.3.2rc1" This reverts commit `cdf8b92fea`. * Revert "Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806)" This reverts commit `0074cad44f`. * Revert "Handle Mastodon::HostValidationError when pulling remoteable assets (#6782)" This reverts commit `4a0a19fe54`. * Revert "Correct the reference to user's password in mastodon:add_user task (#6800)" This reverts commit `338bff8b93`. * Revert "Upgrade Paperclip to version 6.0.0 (#6754)" This reverts commit `b88fcd53f7`.	2018-03-17 14:20:35 +01:00
Yamagishi Kazutoshi	b88fcd53f7	Upgrade Paperclip to version 6.0.0 (#6754 )	2018-03-17 12:37:58 +01:00
Jenkins	447d7e6127	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-09 00:17:17 +00:00
Eugen Rochko	4847149b6e	Always install LDAP, CAS and SAML gems, because they don't require deps (#6663 ) Fix #6534 PAM requires a system dependency so...	2018-03-07 02:25:17 +01:00
Yamagishi Kazutoshi	e9e475a29d	Upgrade chewy to version 5.0.0 (#6649 )	2018-03-06 06:14:26 +01:00
David Yip	1b8fcd4df5	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml	2018-03-02 21:46:44 -06:00
Patrick Figel	e4db0f28d2	Update omniauth-saml to 1.10 (#6587 ) Fixes CVE-2017-11428	2018-03-02 02:32:08 +01:00
Eugen Rochko	47bdb9b33b	Fix #942 : Seamless LDAP login (#6556 )	2018-02-28 19:04:53 +01:00
masarakki	22a441e374	remove-uglifier (#6561 )	2018-02-26 16:19:48 +01:00
Akihiko Odaki	2e8a492e88	Raise Mastodon::HostValidationError when host for HTTP request is private (#6410 )	2018-02-24 19:16:11 +01:00
imncls	bb6988a7ac	Merge branch 'master' of https://github.com/tootsuite/mastodon # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb	2018-02-23 23:28:31 +09:00
Eugen Rochko	61ed133fea	Account archive download (#6460 ) * Fix #201: Account archive download * Export actor and private key in the archive * Optimize BackupService - Add conversation to cached associations of status, because somehow it was forgotten and is source of N+1 queries - Explicitly call GC between batches of records being fetched (Model class allocations are the worst offender) - Stream media files into the tar in 1MB chunks (Do not allocate media file (up to 8MB) as string into memory) - Use #bytesize instead of #size to calculate file size for JSON (Fix FileOverflow error) - Segment media into subfolders by status ID because apparently GIF-to-MP4 media are all named "media.mp4" for some reason * Keep uniquely generated filename in Paperclip::GifTranscoder * Ensure dumped files do not overwrite each other by maintaing directory partitions * Give tar archives a good name * Add scheduler to remove week-old backups * Fix code style issue	2018-02-21 23:21:32 +01:00

... 6 7 8 9 10 ...

929 Commits