Jenkins
f6adb409fd
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-05 22:17:12 +00:00
Eugen Rochko
e9822a4e4e
Bump version to 2.1.2
2018-01-05 04:52:06 +01:00
Jenkins
c69a23ae46
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-04 23:17:11 +00:00
Eugen Rochko
7571c37c99
Bump version to 2.1.1 ( #6164 )
2018-01-04 16:40:26 +01:00
Jenkins
f77c47d01b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-24 15:17:12 +00:00
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
2017-12-24 16:14:33 +01:00
Jenkins
05a2a70ca2
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-16 15:17:12 +00:00
beatrix
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
Daigo 3 Dango
a434d9c0cc
Remove period from the version number ( #6039 )
...
2.1.0. -> 2.1.0
2017-12-15 21:38:25 +01:00
David Yip
82b2e224a2
Merge branch 'gs-master' into prevent-local-only-federation
...
Conflicts:
db/schema.rb
2017-12-15 12:20:56 -06:00
Jenkins
40afadfb01
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-15 18:17:14 +00:00
Eugen Rochko
a29432f0cd
Bump version to 2.1.0 🎆
2017-12-15 19:14:57 +01:00
Jenkins
37254c4f5d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-15 01:17:12 +00:00
Eugen Rochko
098c7d27fe
Bump version to 2.1.0rc6
2017-12-15 02:00:28 +01:00
Jenkins
10f800ab46
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 20:17:13 +00:00
Eugen Rochko
7cad926401
Bump version to 2.1.0rc5
2017-12-13 20:53:39 +01:00
Jenkins
82236a3703
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 18:17:16 +00:00
Eugen Rochko
57fcc21a86
Bump version to 2.1.0rc4
2017-12-13 12:45:12 +01:00
David Yip
a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
2017-12-12 02:54:13 -06:00
David Yip
1138d0c321
Add Rake task to backfill local-only flag ( #253 )
2017-12-10 22:49:59 -06:00
Eugen Rochko
2526ef10c2
Bump version to 2.1.0rc3
2017-12-09 02:42:59 +01:00
Jenkins
776867ea73
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-08 13:17:14 +00:00
Eugen Rochko
369f40bb9f
Bump version to 2.1.0rc2
2017-12-08 01:47:08 +01:00
Jenkins
744447b3c0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-07 04:17:14 +00:00
Akihiko Odaki
c083816c24
Add embed_url to preview cards ( #5775 )
2017-12-07 03:37:43 +01:00
Jenkins
8ca91cef45
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-06 20:17:13 +00:00
Eugen Rochko
f9a0d8f2b9
Bump version to 2.1.0rc1 ( #5834 )
2017-12-06 16:13:32 +01:00
Yamagishi Kazutoshi
b21db9bbde
Using double splat operator ( #5859 )
2017-12-06 11:41:57 +01:00
David Yip
b28b405b97
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-16 22:52:37 -06:00
ysksn
9dd5e329ab
Remove empty strings ( #5732 )
2017-11-17 10:52:30 +09:00
Surinna Curtis
35fbdc36f9
Merge tootsuite/master at 3023725936
2017-11-16 01:21:16 -06:00
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
2017-11-11 20:23:33 +01:00
Naoki Kosaka
4c0a85ef9b
In remove_remote, exclude removed media attachments. ( #5626 )
2017-11-08 15:19:22 +01:00
David Yip
dd28b94cf0
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-26 09:18:27 -05:00
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.
2017-10-26 22:48:35 +09:00
David Yip
42e8c8eb0e
Merge tag 'v2.0.0' into gs-master
2017-10-18 11:52:04 -05:00
Eugen Rochko
3810d98cd8
Bump version to 2.0.0 🐘
2017-10-18 13:53:56 +02:00
Eugen Rochko
637ea3bb5b
Bump version to 2.0.0rc4
2017-10-17 23:16:35 +02:00
David Yip
65154869df
Merge remote-tracking branch 'upstream/master' into upstream-merge-again
2017-10-16 09:54:16 -05:00
Eugen Rochko
bc89995f65
Bump version to 2.0.0rc3
2017-10-16 16:29:00 +02:00
Ondřej Hruška
0bf9261e65
Merge remote-tracking branch 'upstream/master'
2017-10-11 21:27:17 +02:00
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.
2017-10-11 21:20:39 +02:00
kibigo!
8d6b9ba494
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
Eugen Rochko
7c33da45f0
Bump version to 2.0.0rc2
2017-10-10 20:48:26 +02:00
Eugen Rochko
92e7815d1d
Fix #5274 - Create symlink from public/500.html to public/assets/500.html ( #5288 )
2017-10-09 20:51:24 +02:00
Eugen Rochko
0aa810f9c8
Bump version to 2.0.0rc1 ( #5209 )
2017-10-08 22:03:44 +02:00
Eugen Rochko
0717d9b3e6
Set snowflake IDs for backdated statuses ( #5260 )
...
- Rename Mastodon::TimestampIds into Mastodon::Snowflake for clarity
- Skip for statuses coming from inbox, aka delivered in real-time
- Skip for statuses that claim to be from the future
2017-10-08 17:34:34 +02:00
DJ Sundog
85d5da86df
raise Mastodon::ValidationError if audio file duration is over 60 secs
2017-10-07 16:14:34 -07:00
DJ Sundog
e10cff8226
update indentation
2017-10-07 13:55:11 -07:00
DJ Sundog
96ba3482b9
adding support for audio uploads, transcoded to mp4 videos
2017-10-07 19:54:10 +00:00
