treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
8,512 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

142 Commits (fba0f7dae7015e9f8183171b4fc4761eaebf2e79)

Author SHA1 Message Date
Thibaut Girka 827933cd09 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-20 16:49:23 +01:00
Eugen Rochko e73151320d Add translators to AUTHORS.md (#9865) 2019-01-19 22:01:12 +01:00
Thibaut Girka b49d415f37 Merge branch 'master' into glitch-soc/merge-upstream 
No conflicts.
 2019-01-19 18:28:37 +01:00
Eugen Rochko f149ffbcbe Change CHANGELOG.md references from pull requests to authors (#9864) 
Add `rake repo:changelog` to do that automatically
 2019-01-19 16:25:20 +01:00
Thibaut Girka 44f2224606 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
 2019-01-02 15:36:53 +01:00
Eugen Rochko 36a5585cac Update emoji codepoint mappings to v11.0 (#9618) 2018-12-24 19:12:00 +01:00
Thibaut Girka 450b428536 Override current_user when generating static pages 2018-12-19 20:49:58 +01:00
Thibaut Girka f627ea99e4 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.
 2018-10-05 15:23:57 +02:00
Eugen Rochko 1a1160ee24 Add tootctl settings registrations open (#8829) 2018-10-04 16:05:54 +02:00
Thibaut Girka ae5c237607 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
Eugen Rochko 26d73847cb Move more tasks to tootctl (#8675) 
* Move more tasks to tootctl

- tootctl feeds build
- tootctl feeds clear
- tootctl accounts refresh

Clean up exit codes and help messages

* Move user modifying to tootctl

* Improve user modification through CLI, rename commands

add -> create
mod -> modify
del -> delete

To remove ambiguity

* Fix code style issues

* Fix not being able to unset admin/mod role
 2018-09-14 17:42:22 +02:00
Thibaut Girka 4dd208f482 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.
 2018-09-11 16:51:26 +02:00
rinsuki 14604c384f using mailto scheme in AUTHORS.md (#8663) 2018-09-10 02:01:03 +02:00
nightpool b778e40d7d Add rake task for generating AUTHORS.md (#8661) 
* add rake task for generating AUTHORS.md

* update AUTHORS.md

* rubocop
 2018-09-10 01:31:42 +02:00
Thibaut Girka 4f4908311d 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
Quint Guvernator 476ba6e4f0 Fix low-hanging rubocop gripes (#8458) 
* rubocop: quit being so picky

* rubocop: miscellany

* rubocop: prefer present to blank
 2018-08-26 19:22:46 +02:00
Thibaut Girka 7e6a029f1b Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 18:21:33 +02:00
Eugen Rochko ee4af13f51 Fix NUM_DAYS in rake mastodon:media:remove_remote and print warning (#8462) 
Remove old deprecated rake tasks
 2018-08-26 17:19:47 +02:00
Thibaut Girka ae4240d236 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
M Somerville 4b27569841 Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423) 
Still check for S3_CLOUDFRONT_HOST for existing installs.
 2018-08-25 13:27:08 +02:00
Eugen Rochko e6e845f74d Add improved CLI interface for removing remote media (#8411) 
./bin/tootctl media remove --days 7 --background

Make the old rake task point to it
 2018-08-25 13:25:39 +02:00
Thibaut Girka 98dccee657 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
Eugen Rochko fe88a4f42c Get rid of all batch order warnings (#8334) 2018-08-21 12:25:50 +02:00
ThibG 45ee8e304e Add some feedback to maintenance rake tasks (#8173) 2018-08-13 18:17:20 +02:00
ThibG 40c7bd7cdd Add some feedback to maintenance rake tasks (#8173) 2018-08-11 22:02:55 +02:00
David Yip c2f7676dfc Merge remote-tracking branch 'tootsuite/master' into merge-upstream 
Conflicts:
 	app/models/status.rb

The conflict in the Status model was due to
3114ac9655.
It was resolved by accepting tootsuite's changes.
 2018-06-07 05:13:49 -05:00
Eugen Rochko 797c72329f Fix missing column in select in mastodon:feeds:build task (#7720) 2018-06-04 04:21:15 +02:00
Jenkins a76f40890e Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-05-31 01:17:25 +00:00
Eugen Rochko 49a0a3a8a2 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
 2018-05-30 21:09:30 +02:00
David Yip c87f1d99e4 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
Eugen Rochko ca1c696dbd 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
Alejandro Martinez Ruiz 20fcb1f5ae tasks/mastodon: fix prompt for Redis password (#7241) 2018-04-23 16:03:58 +02:00
David Baucum 259e3aa7bf Ability to specify Redis passwd on mastodon:setup (#7222) 
Closes #7221
 2018-04-22 11:49:16 +02:00
Jenkins 62ce70f28c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-03 19:17:20 +00:00
Eugen Rochko ec74c3d7da Do not default SMTP verify mode to "peer", default to "none" (#6996) 2018-04-02 19:19:51 +02:00
David Yip 2567d0a704 Merge remote-tracking branch 'origin/master' into gs-master 2018-03-27 10:44:12 -05:00
Eugen Rochko ebba6fb7f5 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
 2018-03-27 04:33:57 +02:00
Jenkins ae55717f50 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-25 15:17:21 +00:00
Akihiko Odaki 11c19f6cc9 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.
 2018-03-24 12:49:54 +01:00
Jenkins 3d16993fbe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-17 17:17:21 +00:00
Akihiko Odaki 7b247b15f2 Correct the reference to user's password in mastodon:add_user task (#6800) 2018-03-17 13:27:19 +01:00
David Yip 9ca0336c15 Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	README.md
 2018-03-12 17:52:19 -05:00
Ushitora Anqou 44917a10ad 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
 2018-03-12 21:41:26 +01:00
艮 鮟鱇 aa3b1144d1 set SAFETY_ASSURED=1 of db:setup in mastodon:setup (#6758) 2018-03-12 16:21:48 +01:00
Jenkins af2b57a054 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-09 12:17:22 +00:00
Eugen Rochko 512e42fed8 When inside Docker, output saved configuration during mastodon:setup (#6711) 2018-03-09 11:52:18 +01:00
Jenkins 54608d0486 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-09 00:17:17 +00:00
Eugen Rochko f92176899e 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.
 2018-03-08 06:59:42 +01:00
Akihiko Odaki 0016fd40e7 Do not fetch environment variables to determine default locale (#6618) 
The default locale is now set by config.
 2018-03-04 10:00:46 +01:00
David Yip c08c971dd3 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