128 Commits (d8fbd74c47de3148d6693b5cb15e7e868f72448e)

Author	SHA1	Message	Date
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	7 years ago
Quint Guvernator	da13fa5021	Fix low-hanging rubocop gripes (#8458) ... * rubocop: quit being so picky * rubocop: miscellany * rubocop: prefer present to blank	7 years ago
Thibaut Girka	be20eb4b2f	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	b9c3788485	Fix NUM_DAYS in rake mastodon:media:remove_remote and print warning (#8462) ... Remove old deprecated rake tasks	7 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.	7 years ago
M Somerville	2bba6e582d	Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423) ... Still check for S3_CLOUDFRONT_HOST for existing installs.	7 years ago
Eugen Rochko	793eea2982	Add improved CLI interface for removing remote media (#8411) ... ./bin/tootctl media remove --days 7 --background Make the old rake task point to it	7 years ago
Thibaut Girka	8b4abaa90d	Merge branch 'master' into glitch-soc/master ... Conflicts: config/routes.rb Added the “endorsements” route from upstream.	7 years ago
Eugen Rochko	d98de8ada7	Get rid of all batch order warnings (#8334)	7 years ago
ThibG	19da279703	Add some feedback to maintenance rake tasks (#8173)	7 years ago
ThibG	110b3f6335	Add some feedback to maintenance rake tasks (#8173)	7 years ago
David Yip	8142bd2553	Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/models/status.rb The conflict in the Status model was due to 5bf5003384. It was resolved by accepting tootsuite's changes.	7 years ago
Eugen Rochko	c7405fda11	Fix missing column in select in mastodon:feeds:build task (#7720)	7 years ago
Jenkins	165b5dc7f5	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	ad40bf5e0c	Speed up some rake tasks by moving execution to Sidekiq (#7678) ... * Speed up some rake tasks by moving execution to Sidekiq mastodon:media:remove_silenced mastodon:media:remove_remote mastodon:media:redownload_avatars mastodon:feeds:build * Fix code style issue	7 years ago
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	7 years ago
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	7 years ago
Alejandro Martinez Ruiz	06817b3c1f	tasks/mastodon: fix prompt for Redis password (#7241)	7 years ago
David Baucum	ca9192d9ba	Ability to specify Redis passwd on mastodon:setup (#7222) ... Closes #7221	7 years ago
Jenkins	6611100480	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	36eac8ba90	Do not default SMTP verify mode to "peer", default to "none" (#6996)	7 years ago
David Yip	d2cdc2b5a3	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
Eugen Rochko	2a90da1837	Fix UniqueUsernameValidator comparison (#6926) ... Comparison was downcasing only one side, therefore if previously existing account had a non-lowercase spelling, it would be ignored when checking for duplicates. New rake task `mastodon:maintenance:find_duplicate_usernames` will help find constraint violations that might have occured from the presence of this bug. Bump version to 2.3.3	7 years ago
Jenkins	837b3804bf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	54b273bf99	Close http connection in perform method of Request class (#6889) ... HTTP connections must be explicitly closed in many cases, and letting perform method close connections makes its callers less redundant and prevent them from forgetting to close connections.	7 years ago
Jenkins	9341b982b6	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	338bff8b93	Correct the reference to user's password in mastodon:add_user task (#6800)	7 years ago
David Yip	f8e934f955	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md	7 years ago
Ushitora Anqou	051b649628	Detailed SMTP setup (#6759) ... * add detailed SMTP settings setup in mastodon:setup * add localhost SMTP settings setup in mastodon:setup * SMTP settings setup should exit after successful delivery of test mail	7 years ago
艮 鮟鱇	f5f165a5eb	set SAFETY_ASSURED=1 of db:setup in mastodon:setup (#6758)	7 years ago
Jenkins	e553905ba7	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	e5f18ace2a	When inside Docker, output saved configuration during mastodon:setup (#6711)	7 years ago
Jenkins	447d7e6127	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	64db9ed5f6	After blocking domain with reject_media, invalidate cache (#6679) ... Media attachments are part of the association cache of statuses, since they are presumed to be immutable. Unless this cache is cleared manually, the statuses will continue to look like they have media embedded.	7 years ago
Akihiko Odaki	778b37790b	Do not fetch environment variables to determine default locale (#6618) ... The default locale is now set by config.	7 years ago
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	7 years ago
Thomas Leister	ecd36c1ede	Fixes #6584 (#6585)	7 years ago
Paul Woolcock	76198c63b6	Some images can cause `convert` to fail, which crashes this whole task (#6565) ... * Some images can cause `convert` to fail, which crashes this whole task * Add more specific exception	7 years ago
Eugen Rochko	5cc716688a	Ensure the app does not even start if OTP_SECRET is not set (#6557) ... * Ensure the app does not even start if OTP_SECRET is not set * Remove PAPERCLIP_SECRET (it's not used by anything, actually) Imports are for internal consumption and the url option isn't even used correctly, so we can remove the hash stuff from them	7 years ago
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	7 years ago
takayamaki	f69d7cb43b	fix purge_removed_accounts task should suspend account before delete it (#6521)	7 years ago
Jenkins	5ffa6f0fa1	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	cf36d184f4	Interactive `rake mastodon:setup` task (#6451) ... * Add better CLI prompt * Add rake mastodon:setup interactive wizard * Test db/redis/smtp configurations and add admin user at the end * Test database connection even when database does not exist yet	7 years ago
Jenkins	530fcc1c14	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	f7bf36d8fc	Require environment for generate_static_pages (#6420) ... It is required for ApplicationController.	7 years ago
David Yip	2ca965c704	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss	7 years ago
Eugen Rochko	9b3b40df66	Fix regeneration marker not expiring (#6290) ... * Fix regeneration key not getting expired * Add rake task to remove old regeneration markers	7 years ago
Jenkins	0c7dc6c781	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	ed867eca9d	Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252)	7 years ago
Jenkins	f77c47d01b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago