me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
6991 commits 2 branches 0 tags 429 MiB
Commit graph

273 commits

Author SHA1 Message Date
Eugen Rochko
3939ca8a33 Bump version to 2.3.2 2018-03-22 14:13:46 +01:00
Eugen Rochko
f4ef86a334 Bump version to 2.3.2rc5 2018-03-22 11:31:52 +01:00
Jenkins
a9bcd383b8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-21 17:17:20 +00:00
Eugen Rochko
8ccf42c149 Bump version to 2.3.2rc4 2018-03-20 23:49:24 +01:00
Eugen Rochko
59b3b38b0e 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
eba1b109db Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-19 20:17:18 +00:00
Eugen Rochko
fd86b58568 Bump version to 2.3.2rc3 2018-03-19 12:20:57 +01:00
Jenkins
3d16993fbe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-17 17:17:21 +00:00
Eugen Rochko
a9538ac293 Bump version to 2.3.2rc2 2018-03-17 15:28:52 +01:00
Eugen Rochko
64d5c8a512 Bump version to 2.3.2rc1 2018-03-17 14:07:00 +01: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
Jenkins
dd0dafed03 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-13 18:17:20 +00:00
Eugen Rochko
61ad11683d Bump version to 2.3.1 2018-03-13 15:50:15 +01:00
Eugen Rochko
3bf841c74e Bump version to 2.3.1rc3 2018-03-13 09:21:21 +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
Eugen Rochko
9350e691cc Bump version to 2.3.1rc2 2018-03-12 12:48:49 +01:00
Eugen Rochko
b744cfee18 Bump version to 2.3.1rc1 2018-03-11 15:13:13 +01:00
Jenkins
af2b57a054 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-09 12:17:22 +00:00
Eugen Rochko
f08bc1f188 Bump version to 2.3.0 2018-03-09 12:59:58 +01: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
38e93a9541 Bump version to 2.3.0rc3 2018-03-08 11:19:02 +01: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
Eugen Rochko
5b2d4c84d9 Bump version to 2.3.0rc2 2018-03-07 12:06:23 +01:00
Eugen Rochko
ba865c44d8 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 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
Thomas Leister
225d270134 Fixes #6584 (#6585) 2018-03-01 23:30:06 +01:00
Eugen Rochko
4bd1403368 Bump version to 2.3.0rc1 2018-03-01 20:50:23 +01:00
Eugen Rochko
9721b7746a Fix #942: Seamless LDAP login (#6556) 2018-02-28 19:04:53 +01:00
Paul Woolcock
fee184c0fd 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 Rochko
f35356609b 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
c0aabbec0f 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
c9ed272a4a Fix #6525: Make sure file is opened in LazyThumbnail processor (#6529) 2018-02-22 00:28:19 +01:00
Eugen Rochko
f6884555d7 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
takayamaki
2b3d62a8a5 fix purge_removed_accounts task should suspend account before delete it (#6521) 2018-02-21 16:30:46 +01:00
Eugen Rochko
c34ff9fb82 Fix avatar and header issues by using custom geometry detector (#6515) 
* Fix avatar and header issues by using custom geometry detector

Revert a part of #6508. The file passed to dynamic styles method
was not actually a file, but an instance of Paperclip::Attachment,
which broke all styles by always returning {} from the method.

One problem with GIF avatars was that Paperclip::GeometryDetector
reported wrong dimensions for them, e.g. 120x120 GIF avatar would
for some reason be detected as 120x53. By writing our own geometry
parser, we can use FastImage, which also happens to be faster than
ImageMagick, to detect image dimensions, which are also correct.

Unfortunately, this PR does not implement skipping a `convert`
entirely if the dimensions are already correct, as I found no easy
way to write that behaviour into Paperclip without rewriting the
Paperclip::Thumbnail class.

* Only invoke convert if dimension or format needs to be changed
 2018-02-21 03:40:12 +01:00
Jenkins
bf93764ca0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-02-11 18:17:11 +00:00
Eugen Rochko
e8e6786d6f 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
 2018-02-11 18:40:57 +01:00
Jenkins
06d2bfd63f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-02-04 03:17:11 +00:00
Akihiko Odaki
5892127534 Require environment for generate_static_pages (#6420) 
It is required for ApplicationController.
 2018-02-03 18:41:01 +01:00
David Yip
87517e2dd8 Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/views/layouts/mailer.html.haml
	config/locales/ko.yml
 2018-01-28 22:45:17 -06:00
Eugen Rochko
9d2cb4d12d Bump version to 2.2.0 2018-01-29 01:12:36 +01:00
Eugen Rochko
9c212f0f28 ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372) 2018-01-29 01:06:39 +01:00
Jenkins
3cd4a0804b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-24 19:17:11 +00:00
Eugen Rochko
de667c2a95 Bump to 2.2.0rc2 2018-01-24 04:16:30 +01:00
Eugen Rochko
8f60c22ba4 Fix #6311: Replace relative URLs in CSS only for Premailer (#6335) 2018-01-24 02:57:14 +01:00
David Yip
03f157f6da Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/javascript/styles/mastodon/components.scss
 2018-01-20 10:45:43 -06:00
Eugen Rochko
b9794f1a49 Bump version to 2.2.0rc1 2018-01-20 16:27:19 +01:00
Eugen Rochko
896cadceed Improve HTML e-mails based on Litmus tests (#6301) 
* Use PNG images in HTML e-mails

* Make webpack use URLs with host so fonts load inside HTML e-mails

Convert this back to a relative URL in the premailer CSS loader
since local requests are quicker

* Improve responsive design

* Add missing PNG icon
 2018-01-20 01:32:21 +01:00
David Yip
d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/javascript/styles/mastodon/components.scss
	app/javascript/styles/mastodon/modal.scss
 2018-01-19 15:22:10 -06:00
Eugen Rochko
92df0bba59 Fix regeneration marker not expiring (#6290) 
* Fix regeneration key not getting expired

* Add rake task to remove old regeneration markers
 2018-01-18 20:29:56 +01:00
David Yip
de7283a318 Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
	Gemfile.lock
 2018-01-15 22:17:48 -06:00
Eugen Rochko
9613c3238c HTML e-mails for UserMailer (#6256) 
- premailer gem to turn CSS into inline styles automatically
- rework UserMailer templates
- reword UserMailer templates
 2018-01-16 03:29:11 +01:00
Jenkins
6e821c4273 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-15 06:17:15 +00:00
Eugen Rochko
67ee638c28 Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252) 2018-01-15 04:34:28 +01:00
Jenkins
f9a0b246e5 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-09 05:17:13 +00:00
Eugen Rochko
87dd894cf4 Bump version to 2.1.3 2018-01-08 19:15:31 +01:00
Jenkins
86007e913d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-05 22:17:12 +00:00
Eugen Rochko
76268627c2 Bump version to 2.1.2 2018-01-05 04:52:06 +01:00
Jenkins
796a39a283 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-04 23:17:11 +00:00
Eugen Rochko
a0273c2c5e Bump version to 2.1.1 (#6164) 2018-01-04 16:40:26 +01:00
Jenkins
503e7fb4d8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-24 15:17:12 +00:00
Eugen Rochko
50f2d69780 Add rake task to check and purge accounts that are missing in origin (#6085) 
* Add rake task to check and purge accounts that are missing in origin

* Add progress bar and --force options to mastodon:maintenance:purge_removed_accounts
 2017-12-24 16:14:33 +01:00
Jenkins
b47a89be89 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-16 15:17:12 +00:00
beatrix
978e5e5606 Merge pull request #253 from glitch-soc/prevent-local-only-federation 
prevent federation of local-only statuses
 2017-12-16 09:26:48 -05:00
Daigo 3 Dango
64ae134e7b Remove period from the version number (#6039) 
2.1.0. -> 2.1.0
 2017-12-15 21:38:25 +01:00
David Yip
d53f727653 Merge branch 'gs-master' into prevent-local-only-federation 
Conflicts:
	db/schema.rb
 2017-12-15 12:20:56 -06:00
Jenkins
ebfca67b98 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-15 18:17:14 +00:00
Eugen Rochko
b23c9ab7de Bump version to 2.1.0 🎆 2017-12-15 19:14:57 +01:00
Jenkins
601f0fe4a3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-15 01:17:12 +00:00
Eugen Rochko
1079099d2b Bump version to 2.1.0rc6 2017-12-15 02:00:28 +01:00
Jenkins
ac183e024b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-13 20:17:13 +00:00
Eugen Rochko
d4849787c5 Bump version to 2.1.0rc5 2017-12-13 20:53:39 +01:00
Jenkins
1366e96a02 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-13 18:17:16 +00:00
Eugen Rochko
cae49f11c7 Bump version to 2.1.0rc4 2017-12-13 12:45:12 +01:00
David Yip
a56c9ac5dc Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2017-12-12 02:54:13 -06:00
David Yip
234dc012d0 Add Rake task to backfill local-only flag (#253) 2017-12-10 22:49:59 -06:00
Eugen Rochko
a6fdeedb47 Bump version to 2.1.0rc3 2017-12-09 02:42:59 +01:00
Jenkins
c6572ed6c8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-08 13:17:14 +00:00
Eugen Rochko
3126869f5a Bump version to 2.1.0rc2 2017-12-08 01:47:08 +01:00
Jenkins
099159741b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-07 04:17:14 +00:00
Akihiko Odaki
ce3989fc6a Add embed_url to preview cards (#5775) 2017-12-07 03:37:43 +01:00
Jenkins
a3a7b6a848 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-06 20:17:13 +00:00
Eugen Rochko
11a9900269 Bump version to 2.1.0rc1 (#5834) 2017-12-06 16:13:32 +01:00
Yamagishi Kazutoshi
fba46b6072 Using double splat operator (#5859) 2017-12-06 11:41:57 +01:00
David Yip
5f689cdf78 Merge remote-tracking branch 'origin/master' into gs-master 2017-11-16 22:52:37 -06:00
ysksn
08cb63c360 Remove empty strings (#5732) 2017-11-17 10:52:30 +09:00
Surinna Curtis
02ae609d9a Merge tootsuite/master at ab48f2b239 2017-11-16 01:21:16 -06:00
Eugen Rochko
97178b6d86 Add moderator role and add pundit policies for admin actions (#5635) 
* Add moderator role and add pundit policies for admin actions

* Add rake task for turning user into mod and revoking it again

* Fix handling of unauthorized exception

* Deliver new report e-mails to staff, not just admins

* Add promote/demote to admin UI, hide some actions conditionally

* Fix unused i18n
 2017-11-11 20:23:33 +01:00
Naoki Kosaka
bc20bea20e In remove_remote, exclude removed media attachments. (#5626) 2017-11-08 15:19:22 +01:00
David Yip
d3db08b69f Merge remote-tracking branch 'origin/master' into gs-master 2017-10-26 09:18:27 -05:00
unarist
4472c5723a Fix Cocaine::ExitStatusError when upload small non-animated GIF (#5489) 
Looks like copied tempfile need to be flushed before further processing. This issue won't happen if the uploaded file has enough file size.
 2017-10-26 22:48:35 +09:00
David Yip
dd4f9f18cb Merge tag 'v2.0.0' into gs-master 2017-10-18 11:52:04 -05:00
Eugen Rochko
b222a9d5ee Bump version to 2.0.0 🐘 2017-10-18 13:53:56 +02:00
Eugen Rochko
cb48c98e02 Bump version to 2.0.0rc4 2017-10-17 23:16:35 +02:00
David Yip
6f54953c07 Merge remote-tracking branch 'upstream/master' into upstream-merge-again 2017-10-16 09:54:16 -05:00
Eugen Rochko
7603119d3a Bump version to 2.0.0rc3 2017-10-16 16:29:00 +02:00