tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,383 Commits 10 Branches 0 Tags
106a5d7b83e471e7011b22da25bf09396af28662
Commit Graph
237 Commits
Author SHA1 Message Date
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
Eugen RochkoandGitHub 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
Eugen RochkoandGitHub 63553c6b5c Add support for separate Redis for cache (#7272) 
* Add support for separate Redis for cache

CACHE_REDIS_URL to allow using a different Redis server for cache
purposes, with cache-specific configuration such as key eviction

* Fix code style issues
 2018-04-27 01:37:59 +02:00
Alejandro Martinez RuizandEugen Rochko 06817b3c1f tasks/mastodon: fix prompt for Redis password (#7241) 2018-04-23 16:03:58 +02:00
David BaucumandEugen Rochko ca9192d9ba Ability to specify Redis passwd on mastodon:setup (#7222) 
Closes #7221
 2018-04-22 11:49:16 +02:00
Yamagishi KazutoshiandEugen Rochko 084cf0babf Add extract_foreign_key_action to Mastodon::MigrationHelpers (#7195) 2018-04-20 12:21:28 +02:00
Thibaut Girka 88bcfaeb18 Point to glitch-soc source and not tootsuite on the public page 
(hello AGPLv3)
 2018-04-08 15:43:26 +02:00
Jenkins 6611100480 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-03 19:17:20 +00:00
Eugen RochkoandGitHub 36eac8ba90 Do not default SMTP verify mode to "peer", default to "none" (#6996) 2018-04-02 19:19:51 +02:00
David Yip d2cdc2b5a3 Merge remote-tracking branch 'origin/master' into gs-master 2018-03-27 10:44:12 -05:00
Eugen RochkoandGitHub 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
 2018-03-27 04:33:57 +02:00
Jenkins 837b3804bf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-25 15:17:21 +00:00
Akihiko OdakiandEugen Rochko 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.
 2018-03-24 12:49:54 +01:00
Jenkins 03b2f701e7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-23 10:17:18 +00:00
Eugen RochkoandGitHub 6cc432bbc4 Bump version to 2.3.2 2018-03-22 14:13:46 +01:00
Eugen RochkoandGitHub dafae9818d Bump version to 2.3.2rc5 2018-03-22 11:31:52 +01:00
Jenkins 6290cd7969 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-21 17:17:20 +00:00
Eugen RochkoandGitHub f64af6473f Bump version to 2.3.2rc4 2018-03-20 23:49:24 +01:00
Eugen RochkoandGitHub ac49c7932d Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845) 
Fix #6816, fix #6790
 2018-03-20 19:41:51 +01:00
Jenkins df70571bfe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-19 20:17:18 +00:00
Eugen RochkoandGitHub 74c39fada0 Bump version to 2.3.2rc3 2018-03-19 12:20:57 +01:00
Jenkins 9341b982b6 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-17 17:17:21 +00:00
Eugen RochkoandGitHub 092f1df9d0 Bump version to 2.3.2rc2 2018-03-17 15:28:52 +01:00
Eugen RochkoandGitHub cdf8b92fea Bump version to 2.3.2rc1 2018-03-17 14:07:00 +01:00
Akihiko OdakiandEugen Rochko 338bff8b93 Correct the reference to user's password in mastodon:add_user task (#6800) 2018-03-17 13:27:19 +01:00
Jenkins d75a6054a0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-13 18:17:20 +00:00
Eugen RochkoandGitHub 2ef1ce1182 Bump version to 2.3.1 2018-03-13 15:50:15 +01:00
Eugen RochkoandGitHub 79d3a8553f Bump version to 2.3.1rc3 2018-03-13 09:21:21 +01:00
David Yip f8e934f955 Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	README.md
 2018-03-12 17:52:19 -05:00
Ushitora AnqouandEugen Rochko 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
 2018-03-12 21:41:26 +01:00
艮 鮟鱇andEugen Rochko f5f165a5eb set SAFETY_ASSURED=1 of db:setup in mastodon:setup (#6758) 2018-03-12 16:21:48 +01:00
Eugen RochkoandGitHub f89ff65ec7 Bump version to 2.3.1rc2 2018-03-12 12:48:49 +01:00
Eugen RochkoandGitHub ab27dccba5 Bump version to 2.3.1rc1 2018-03-11 15:13:13 +01:00
Jenkins e553905ba7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-09 12:17:22 +00:00
Eugen RochkoandGitHub 6e309f5e45 Bump version to 2.3.0 2018-03-09 12:59:58 +01:00
Eugen RochkoandGitHub e5f18ace2a When inside Docker, output saved configuration during mastodon:setup (#6711) 2018-03-09 11:52:18 +01:00
Jenkins 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-09 00:17:17 +00:00
Eugen RochkoandGitHub bd077ad7d9 Bump version to 2.3.0rc3 2018-03-08 11:19:02 +01:00
Eugen RochkoandGitHub 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.
 2018-03-08 06:59:42 +01:00
Eugen RochkoandGitHub 4ca60c665e Bump version to 2.3.0rc2 2018-03-07 12:06:23 +01:00
Eugen RochkoandGitHub 78d772af86 Fix #3807: Increase avatars to 400x400 max (#6651) 
But do not upscale when they are smaller
 2018-03-06 06:29:01 +01:00
Akihiko OdakiandEugen Rochko 778b37790b 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 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
Thomas LeisterandEugen Rochko ecd36c1ede Fixes #6584 (#6585) 2018-03-01 23:30:06 +01:00
Eugen RochkoandGitHub 64f2ada5d4 Bump version to 2.3.0rc1 2018-03-01 20:50:23 +01:00
Eugen RochkoandGitHub 47bdb9b33b Fix #942: Seamless LDAP login (#6556) 2018-02-28 19:04:53 +01:00
Paul WoolcockandEugen Rochko 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
 2018-02-26 22:01:49 +01:00
Eugen RochkoandGitHub 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
 2018-02-26 01:31:44 +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 RochkoandGitHub d3a62d2637 Fix #6525: Make sure file is opened in LazyThumbnail processor (#6529) 2018-02-22 00:28:19 +01:00