de7283a318
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
Gemfile.lock
2018-01-15 22:17:48 -06:00
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
6e821c4273
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-15 06:17:15 +00:00
67ee638c28
Move e-mail digest task to sidekiq, reduce workload, improve hint ( #6252 )
2018-01-15 04:34:28 +01:00
f9a0b246e5
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-09 05:17:13 +00:00
87dd894cf4
Bump version to 2.1.3
2018-01-08 19:15:31 +01:00
86007e913d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-05 22:17:12 +00:00
76268627c2
Bump version to 2.1.2
2018-01-05 04:52:06 +01:00
796a39a283
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-04 23:17:11 +00:00
a0273c2c5e
Bump version to 2.1.1 ( #6164 )
2018-01-04 16:40:26 +01:00
503e7fb4d8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-24 15:17:12 +00:00
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
b47a89be89
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-16 15:17:12 +00:00
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
64ae134e7b
Remove period from the version number ( #6039 )
...
2.1.0. -> 2.1.0
2017-12-15 21:38:25 +01:00
d53f727653
Merge branch 'gs-master' into prevent-local-only-federation
...
Conflicts:
db/schema.rb
2017-12-15 12:20:56 -06:00
ebfca67b98
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-15 18:17:14 +00:00
b23c9ab7de
Bump version to 2.1.0 🎆
2017-12-15 19:14:57 +01:00
601f0fe4a3
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-15 01:17:12 +00:00
1079099d2b
Bump version to 2.1.0rc6
2017-12-15 02:00:28 +01:00
ac183e024b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 20:17:13 +00:00
d4849787c5
Bump version to 2.1.0rc5
2017-12-13 20:53:39 +01:00
1366e96a02
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 18:17:16 +00:00
cae49f11c7
Bump version to 2.1.0rc4
2017-12-13 12:45:12 +01:00
a56c9ac5dc
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
2017-12-12 02:54:13 -06:00
234dc012d0
Add Rake task to backfill local-only flag ( #253 )
2017-12-10 22:49:59 -06:00
a6fdeedb47
Bump version to 2.1.0rc3
2017-12-09 02:42:59 +01:00
c6572ed6c8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-08 13:17:14 +00:00
3126869f5a
Bump version to 2.1.0rc2
2017-12-08 01:47:08 +01:00
099159741b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-07 04:17:14 +00:00
ce3989fc6a
Add embed_url to preview cards ( #5775 )
2017-12-07 03:37:43 +01:00
a3a7b6a848
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-06 20:17:13 +00:00
11a9900269
Bump version to 2.1.0rc1 ( #5834 )
2017-12-06 16:13:32 +01:00
fba46b6072
Using double splat operator ( #5859 )
2017-12-06 11:41:57 +01:00
5f689cdf78
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-16 22:52:37 -06:00
08cb63c360
Remove empty strings ( #5732 )
2017-11-17 10:52:30 +09:00
02ae609d9a
Merge tootsuite/master at ab48f2b239
2017-11-16 01:21:16 -06:00
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
bc20bea20e
In remove_remote, exclude removed media attachments. ( #5626 )
2017-11-08 15:19:22 +01:00
d3db08b69f
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-26 09:18:27 -05:00
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
dd4f9f18cb
Merge tag 'v2.0.0' into gs-master
2017-10-18 11:52:04 -05:00
b222a9d5ee
Bump version to 2.0.0 🐘
2017-10-18 13:53:56 +02:00
cb48c98e02
Bump version to 2.0.0rc4
2017-10-17 23:16:35 +02:00
6f54953c07
Merge remote-tracking branch 'upstream/master' into upstream-merge-again
2017-10-16 09:54:16 -05:00
7603119d3a
Bump version to 2.0.0rc3
2017-10-16 16:29:00 +02:00
132a22ace5
Merge remote-tracking branch 'upstream/master'
2017-10-11 21:27:17 +02:00
93e3eaf95d
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.
2017-10-11 21:20:39 +02:00
02827345ae
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
03457653e9
Bump version to 2.0.0rc2
2017-10-10 20:48:26 +02:00
David Yip