glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	4806232997	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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>	6 years ago
Thibaut Girka	2267eee356	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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>	6 years ago
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.	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
Thibaut Girka	06cc04fd23	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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>	6 years ago
Thibaut Girka	0e34e91661	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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>	6 years ago
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.	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
Thibaut Girka	04e2c67389	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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>	6 years ago
Thibaut Girka	5e0cf92fd1	Merge branch 'master' into glitch-soc/merge-upstream No conflicts.	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
Thibaut Girka	dbe311f0e9	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/locales/simple_form.pl.yml	6 years ago
Eugen Rochko	ee5e24807f	Add `tootctl domains crawl` (#9809 )	6 years ago
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>	6 years ago
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>	6 years ago
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.	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
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	6 years ago
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	6 years ago
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>	6 years ago
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>	6 years ago
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.	6 years ago
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>	6 years ago
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>	6 years ago
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.	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
Thibaut Girka	1df392819d	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
Thibaut Girka	d32d33f408	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	84e5ed43e7	Preload common JSON-LD contexts (#9412 ) Fixes #9411	6 years ago
Thibaut Girka	ad7a3974cc	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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>	6 years ago
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).	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
Thibaut Girka	bfe2b9cc50	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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>	6 years ago
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>	6 years ago
Thibaut Girka	9201398507	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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>	6 years ago
Thibaut Girka	94ad76a5b9	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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>	6 years ago
Eugen Rochko	d4415cc316	Bump i18n-tasks from master to 0.9.28 (#9148 )	6 years ago
Thibaut Girka	f16d66c5c8	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	b40ea6d1d4	Bump sanitize from 4.6.6 to 5.0.0 (#9140 )	6 years ago
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.	6 years ago
Eugen Rochko	32f950a7a8	Update i18n-tasks to master (#9139 )	6 years ago
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>	6 years ago
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>	6 years ago
Thibaut Girka	b00f60f1d3	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	26fe37c414	Update i18n-tasks and change CircleCI command (#9104 ) * Update i18n-tasks and CircleCI command * Fix #9088 * Update i18n-tasks * Fix ast	6 years ago
Thibaut Girka	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.	6 years ago
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>	6 years ago
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>	6 years ago
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	6 years ago
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>	6 years ago
Thibaut Girka	8f3096b846	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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>	6 years ago
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.	6 years ago
Eugen Rochko	4f0bdbaaaf	Downgrade fog-openstack to 0.3.7 and fog-core to 2.1.0 (#9049 ) Fix #8889	6 years ago
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>	6 years ago
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>	6 years ago
Thibaut Girka	8f720be9f3	Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream	6 years ago
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>	6 years ago
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	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
Thibaut Girka	d17844e6d1	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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>	6 years ago
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>	6 years ago
Thibaut Girka	611740ce81	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	30dd7f3d90	Remove unused ruby-progressbar dependency (#8896 ) * Remove unused ruby-progressbar dependency * Remove unused colorize dependency	6 years ago
Thibaut Girka	98bb6815a7	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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>	6 years ago
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>	6 years ago
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.	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
Grey Baker	3a2f007eb0	Promote colorize to top-level dependency (#8844 )	6 years ago
Thibaut Girka	24d05c7a50	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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>	6 years ago
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	6 years ago
Eugen Rochko	e09301f414	Adjust bootsnap configuration for newer version (#8826 )	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
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>	6 years ago
Eugen Rochko	56efc28189	Update ruby dependencies (#8743 ) * Update ffi to 1.9.25 * Update private_address_check to 0.5.0	6 years ago
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	6 years ago
Yamagishi Kazutoshi	0ddbccf7e6	Upgrade Babel to version 7.0.0 (#5925 )	6 years ago
Alexander	64a5561b5a	update devise_pam_authenticatable2, new feature: pam gets ip address of client (#8623 )	6 years ago
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	6 years ago
Eugen Rochko	c597249124	Add thor to Gemfile directly (#8467 ) It's a common dependency, but just in case	6 years ago
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.	6 years ago
Eugen Rochko	b37ae64578	Upgrade Doorkeeper to 5.0.0 (#8409 ) See doorkeeper-gem/doorkeeper#1137	6 years ago
Thibaut Girka	8b4abaa90d	Merge branch 'master' into glitch-soc/master Conflicts: config/routes.rb Added the “endorsements” route from upstream.	6 years ago
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	6 years ago
ThibG	8ac5e651e1	Upgrade doorkeeper to 4.4.2 (#8321 )	6 years ago
Thibaut Girka	88a0395a58	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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	6 years ago
Eugen Rochko	c6eab9e0aa	Add Makara dependency to support read-replicas (#8216 ) Not active by default unless config/database.yml is edited	6 years ago
Eugen Rochko	464daffdf9	Upgrade Doorkeeper to 4.4.1 (#8197 )	6 years ago
S.H	5f41bbd274	Update Rails (#8141 ) * Update Rails * fix Update Rails	6 years ago
S.H	2aeeffc3ec	Update Rails (#8141 ) * Update Rails * fix Update Rails	6 years ago
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…	7 years ago
Eugen Rochko	53f0452b70	Remove rack-timeout (#7809 ) Timeout considered harmful due to leaving the app in a broken state, including unreaped database connections	7 years ago
Thibaut Girka	b481e4fac1	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: config/locales/simple_form.ja.yml	7 years ago
MIYAGI Hikaru	0b1f88cfd5	Upgrade posix-spawn to master (#7542 )	7 years ago
Thibaut Girka	78ac246b87	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: Gemfile Solved conflicts by using upstream's line for posix-spawn	7 years ago
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	7 years ago
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	7 years ago
Yamagishi Kazutoshi	f77b11cd10	Update http_parser.rb to head version (#7467 )	7 years ago
Yamagishi Kazutoshi	4d706f9976	Downgrade doorkeeper to version 4.2.6 (#7456 ) ref https://github.com/doorkeeper-gem/doorkeeper/pull/1060	7 years ago

1 2 3 4 5 ...

466 Commits (c01de0f7214d7241a549b676a80768c9af6983c3)