Commit Graph

169 Commits (26ecee79bfd4cb4f97a91e57e7a8b3fb7de3d82a)

Author SHA1 Message Date
David Yip 89a9d629f7
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
	Gemfile.lock
8 years ago
Eugen Rochko 5276c0a090
HTML e-mails for UserMailer (#6256)
- premailer gem to turn CSS into inline styles automatically
- rework UserMailer templates
- reword UserMailer templates
8 years ago
Jenkins 0c7dc6c781 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
Eugen Rochko ed867eca9d
Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252) 8 years ago
Jenkins 7c719c567c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
Eugen Rochko ff6ca8bdc6
Bump version to 2.1.3 8 years ago
Jenkins f6adb409fd Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
Eugen Rochko e9822a4e4e
Bump version to 2.1.2 8 years ago
Jenkins c69a23ae46 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
Eugen Rochko 7571c37c99
Bump version to 2.1.1 (#6164) 8 years ago
Jenkins f77c47d01b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
Eugen Rochko cafe27fb29
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
8 years ago
Jenkins 05a2a70ca2 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
beatrix e202efdf8a
Merge pull request #253 from glitch-soc/prevent-local-only-federation
prevent federation of local-only statuses
8 years ago
Daigo 3 Dango a434d9c0cc Remove period from the version number (#6039)
2.1.0. -> 2.1.0
8 years ago
David Yip 82b2e224a2
Merge branch 'gs-master' into prevent-local-only-federation
Conflicts:
	db/schema.rb
8 years ago
Jenkins 40afadfb01 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
Eugen Rochko a29432f0cd
Bump version to 2.1.0 🎆 8 years ago
Jenkins 37254c4f5d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
Eugen Rochko 098c7d27fe
Bump version to 2.1.0rc6 8 years ago
Jenkins 10f800ab46 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
Eugen Rochko 7cad926401
Bump version to 2.1.0rc5 8 years ago
Jenkins 82236a3703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
Eugen Rochko 57fcc21a86
Bump version to 2.1.0rc4 8 years ago
David Yip a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream 8 years ago
David Yip 1138d0c321
Add Rake task to backfill local-only flag (#253) 8 years ago
Eugen Rochko 2526ef10c2
Bump version to 2.1.0rc3 8 years ago
Jenkins 776867ea73 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
Eugen Rochko 369f40bb9f
Bump version to 2.1.0rc2 8 years ago
Jenkins 744447b3c0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
Akihiko Odaki c083816c24 Add embed_url to preview cards (#5775) 8 years ago
Jenkins 8ca91cef45 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
Eugen Rochko f9a0d8f2b9
Bump version to 2.1.0rc1 (#5834) 8 years ago
Yamagishi Kazutoshi b21db9bbde Using double splat operator (#5859) 8 years ago
David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master 8 years ago
ysksn 9dd5e329ab Remove empty strings (#5732) 8 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936 8 years ago
Eugen Rochko 7bb8b0b2fc
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
8 years ago
Naoki Kosaka 4c0a85ef9b In remove_remote, exclude removed media attachments. (#5626) 8 years ago
David Yip dd28b94cf0 Merge remote-tracking branch 'origin/master' into gs-master 8 years ago
unarist 4f337c020a 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.
8 years ago
David Yip 42e8c8eb0e Merge tag 'v2.0.0' into gs-master 8 years ago
Eugen Rochko 3810d98cd8 Bump version to 2.0.0 🐘 8 years ago
Eugen Rochko 637ea3bb5b Bump version to 2.0.0rc4 8 years ago
David Yip 65154869df Merge remote-tracking branch 'upstream/master' into upstream-merge-again 8 years ago
Eugen Rochko bc89995f65 Bump version to 2.0.0rc3 8 years ago
Ondřej Hruška 0bf9261e65
Merge remote-tracking branch 'upstream/master' 8 years ago
aschmitz e5d8166a12 Fix #5329 (#5332)
This fixes #5329, which occurred when using MigrationHelpers on a
table that Postgres estimated to be non-empty when it was actually
empty.
8 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165 8 years ago
Eugen Rochko 7c33da45f0 Bump version to 2.0.0rc2 8 years ago