Thibaut Girka
444796b69b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
2019-07-23 10:51:07 +02:00
Eugen Rochko
bd87e66679
Remove WebSub subscriptions ( #11303 )
2019-07-21 04:08:00 +02:00
Thibaut Girka
a2a64ecd3e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- .eslintrc.yml
Removed, as upstream removed it.
- app/controllers/admin/statuses_controller.rb
Minor code cleanup when porting one of our features.
- app/models/account.rb
Note length validation has changed upstream.
We now use upstream's validation (dropped legacy glitch-soc
account metadata stuff) but with configurable limit.
- app/services/post_status_service.rb
Upstream has added support for scheduled toots, refactoring
the code a bit. Adapted our changes to this refactoring.
- app/views/stream_entries/_detailed_status.html.haml
Not a real conflict, changes too close.
- app/views/stream_entries/_simple_status.html.haml
Not a real conflict, changes too close.
2019-01-10 21:00:30 +01:00
Eugen Rochko
1c6588accc
Redesign admin instances area ( #9645 )
2019-01-08 13:39:49 +01:00
Thibaut Girka
3e686beaea
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/routes.rb
Upstream changed some admin routes, conflict was because of an added :show
action for statuses on our side. Kept it.
2018-12-23 11:28:28 +01:00
ysksn
6a2d030c2f
Add specs for ReportNotePolicy ( #9592 )
2018-12-20 17:52:18 +01:00
ysksn
b93e317886
Add specs for policies ( #9591 )
...
* Add spec for RelayPolicy
* Add specs for SubscriptionPolicy
* Add specs for SettingsPolicy
* Add specs for TagPolicy
* Add specs for ReportPolicy
2018-12-20 17:52:07 +01:00
ysksn
be9640bfc2
Add specs for UserPolicy ( #9593 )
2018-12-20 17:51:55 +01:00
ysksn
d649d84594
Add specs for InvitePolicy ( #9589 )
2018-12-20 04:23:09 +01:00
ysksn
44189c33d1
Add specs for EmailDomainBlockPolicy ( #9586 )
2018-12-20 03:51:41 +01:00
ysksn
08cb8a1ff3
Add specs for InstancePolicy ( #9587 )
2018-12-20 03:51:31 +01:00
ysksn
e181f99739
Add specs for DomainBlockPolicy ( #9585 )
2018-12-20 03:47:51 +01:00
ysksn
5088213f5e
Add specs for CustomEmojiPolicy ( #9584 )
2018-12-20 03:24:28 +01:00
ysksn
5d724aa129
Add specs for BackupPolicy ( #9576 )
2018-12-19 18:24:15 +01:00
Thibaut Girka
add74816a5
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-19 12:58:49 +01:00
ysksn
af56efdec5
Add specs for AccountPolicy ( #9575 )
2018-12-19 08:56:59 +01:00
ysksn
0a1ade4f02
Add specs for AccountModerationNotePolicy ( #9571 )
2018-12-19 07:24:03 +01:00
ysksn
102e4cfa32
Add specs for StatusPolicy ( #9569 )
2018-12-19 05:19:20 +01:00
Thibaut Girka
9f2945ef80
Add test to disallow remote users from fetching local-only toots
2018-07-31 15:41:04 +02:00
David Yip
f6355f6ffb
Update StatusPolicy to check current_account for local_only? toots.
...
StatusPolicy#account was renamed to StatusPolicy#current_account in
upstream. This commit renames the local-only changes to match and
augments the #show? policy spec with what we expect for local-only
toots.
2017-11-17 09:07:21 -06:00
Jack Jennings
33f669a5f8
Add status destroy authorization to policy ( #3453 )
...
* Add status destroy authorization to policy
* Create explicit unreblog status authorization
2017-05-30 22:56:31 +02:00
Jack Jennings
22cf18e16f
Fix incorrect visibility setter in StatusPolicySpec ( #3456 )
2017-05-30 22:14:32 +02:00
Jack Jennings
e031fd60ad
Move status reblog authorization into policy ( #3425 )
2017-05-30 15:16:14 +02:00
Jack Jennings
3a2003ba86
Extract authorization policy for viewing statuses ( #3150 )
2017-05-29 18:22:22 +02:00
