2ca965c704
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
9b3b40df66
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
89a9d629f7
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
Gemfile.lock
2018-01-15 22:17:48 -06:00
5276c0a090
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
0c7dc6c781
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-15 06:17:15 +00:00
ed867eca9d
Move e-mail digest task to sidekiq, reduce workload, improve hint ( #6252 )
2018-01-15 04:34:28 +01:00
7c719c567c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-09 05:17:13 +00:00
ff6ca8bdc6
Bump version to 2.1.3
2018-01-08 19:15:31 +01:00
f6adb409fd
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-05 22:17:12 +00:00
e9822a4e4e
Bump version to 2.1.2
2018-01-05 04:52:06 +01:00
c69a23ae46
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-04 23:17:11 +00:00
7571c37c99
Bump version to 2.1.1 ( #6164 )
2018-01-04 16:40:26 +01:00
f77c47d01b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-24 15:17:12 +00:00
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
2017-12-24 16:14:33 +01:00
05a2a70ca2
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-16 15:17:12 +00:00
e202efdf8a
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
a434d9c0cc
Remove period from the version number ( #6039 )
...
2.1.0. -> 2.1.0
2017-12-15 21:38:25 +01:00
82b2e224a2
Merge branch 'gs-master' into prevent-local-only-federation
...
Conflicts:
db/schema.rb
2017-12-15 12:20:56 -06:00
40afadfb01
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-15 18:17:14 +00:00
a29432f0cd
Bump version to 2.1.0 🎆
2017-12-15 19:14:57 +01:00
37254c4f5d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-15 01:17:12 +00:00
098c7d27fe
Bump version to 2.1.0rc6
2017-12-15 02:00:28 +01:00
10f800ab46
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 20:17:13 +00:00
7cad926401
Bump version to 2.1.0rc5
2017-12-13 20:53:39 +01:00
82236a3703
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 18:17:16 +00:00
57fcc21a86
Bump version to 2.1.0rc4
2017-12-13 12:45:12 +01:00
a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
2017-12-12 02:54:13 -06:00
1138d0c321
Add Rake task to backfill local-only flag ( #253 )
2017-12-10 22:49:59 -06:00
2526ef10c2
Bump version to 2.1.0rc3
2017-12-09 02:42:59 +01:00
776867ea73
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-08 13:17:14 +00:00
369f40bb9f
Bump version to 2.1.0rc2
2017-12-08 01:47:08 +01:00
744447b3c0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-07 04:17:14 +00:00
c083816c24
Add embed_url to preview cards ( #5775 )
2017-12-07 03:37:43 +01:00
8ca91cef45
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-06 20:17:13 +00:00
f9a0d8f2b9
Bump version to 2.1.0rc1 ( #5834 )
2017-12-06 16:13:32 +01:00
b21db9bbde
Using double splat operator ( #5859 )
2017-12-06 11:41:57 +01:00
b28b405b97
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-16 22:52:37 -06:00
9dd5e329ab
Remove empty strings ( #5732 )
2017-11-17 10:52:30 +09:00
35fbdc36f9
Merge tootsuite/master at 3023725936
2017-11-16 01:21:16 -06:00
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
2017-11-11 20:23:33 +01:00
4c0a85ef9b
In remove_remote, exclude removed media attachments. ( #5626 )
2017-11-08 15:19:22 +01:00
dd28b94cf0
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-26 09:18:27 -05:00
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.
2017-10-26 22:48:35 +09:00
42e8c8eb0e
Merge tag 'v2.0.0' into gs-master
2017-10-18 11:52:04 -05:00
3810d98cd8
Bump version to 2.0.0 🐘
2017-10-18 13:53:56 +02:00
637ea3bb5b
Bump version to 2.0.0rc4
2017-10-17 23:16:35 +02:00
65154869df
Merge remote-tracking branch 'upstream/master' into upstream-merge-again
2017-10-16 09:54:16 -05:00
bc89995f65
Bump version to 2.0.0rc3
2017-10-16 16:29:00 +02:00
0bf9261e65
Merge remote-tracking branch 'upstream/master'
2017-10-11 21:27:17 +02:00
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.
2017-10-11 21:20:39 +02:00
David Yip
Eugen Rochko
Jenkins
beatrix
Daigo 3 Dango
Akihiko Odaki
Yamagishi Kazutoshi
ysksn
Surinna Curtis
Naoki Kosaka
unarist
Ondřej Hruška
aschmitz