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
3c033c4352
Add moderation warnings ( #9519 )
...
* Add moderation warnings
Replace individual routes for disabling, silencing, and suspending
a user, as well as the report update route, with a unified account
action controller that allows you to select an action (none,
disable, silence, suspend) as well as whether it should generate an
e-mail notification with optional custom text. That notification,
with the optional custom text, is saved as a warning.
Additionally, there are warning presets you can configure to save
time when performing the above.
* Use Account#local_username_and_domain
2018-12-22 20:02:09 +01:00
eee2b05ea2
Add specs for CustomEmojiFilter ( #9599 )
2018-12-21 18:52:57 +01:00
de3cecf37a
Add specs for AdminMailer ( #9597 )
2018-12-21 09:34:34 +01:00
1bc78ec50e
Add specs for InstancePresenter ( #9596 )
2018-12-21 08:59:56 +01:00
6a2d030c2f
Add specs for ReportNotePolicy ( #9592 )
2018-12-20 17:52:18 +01:00
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
be9640bfc2
Add specs for UserPolicy ( #9593 )
2018-12-20 17:51:55 +01:00
d649d84594
Add specs for InvitePolicy ( #9589 )
2018-12-20 04:23:09 +01:00
44189c33d1
Add specs for EmailDomainBlockPolicy ( #9586 )
2018-12-20 03:51:41 +01:00
08cb8a1ff3
Add specs for InstancePolicy ( #9587 )
2018-12-20 03:51:31 +01:00
e181f99739
Add specs for DomainBlockPolicy ( #9585 )
2018-12-20 03:47:51 +01:00
5088213f5e
Add specs for CustomEmojiPolicy ( #9584 )
2018-12-20 03:24:28 +01:00
5d724aa129
Add specs for BackupPolicy ( #9576 )
2018-12-19 18:24:15 +01:00
add74816a5
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-19 12:58:49 +01:00
af56efdec5
Add specs for AccountPolicy ( #9575 )
2018-12-19 08:56:59 +01:00
0a1ade4f02
Add specs for AccountModerationNotePolicy ( #9571 )
2018-12-19 07:24:03 +01:00
102e4cfa32
Add specs for StatusPolicy ( #9569 )
2018-12-19 05:19:20 +01:00
034ffc079e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/admin/base_controller.rb
Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
Updated using upstream's code but using maxChars instead of the
hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
Upstream redesigned the onboarding modal. Not sure why we had a
conflict there.
2018-12-18 16:55:15 +01:00
dd85700a3e
Add spec for AccountableConcern#log_action ( #9559 )
2018-12-18 16:43:03 +01:00
e709b8da0d
Ignore low-confidence CharlockHolmes guesses when parsing link cards ( #9510 )
...
* Add failing test for windows-1251 link cards
* Ignore low-confidence CharlockHolmes guesses
Fixes #9466
* Fix no method error when charlock holmes cannot detect charset
2018-12-17 19:19:45 +01:00
0c80715235
Add spec for Api::V1::Timelines::DirectController ( #9547 )
2018-12-17 11:36:20 +01:00
351938520d
Add specs for Api::V1::Instances::PeersController ( #9546 )
2018-12-17 11:35:55 +01:00
2d871feb10
Add spec for Api::V1::EndorsementsController ( #9543 )
2018-12-17 11:32:44 +01:00
3fa9615cb3
Add spec for Api::V1::Instances::ActivityController ( #9545 )
2018-12-17 11:32:24 +01:00
a3dcbfddd6
Add specs for Accounts::PinsController ( #9542 )
2018-12-17 06:03:51 +01:00
65e994b29b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb
Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.
2018-12-15 10:45:53 +01:00
3c31c28605
Add spec for Admin::ActionLogsController#index ( #9522 )
2018-12-14 20:37:01 +01:00
458e2b0c5b
Add specs for RemoteInteractionController ( #9524 )
2018-12-14 20:36:40 +01:00
c1600a0f69
Add spec for Admin::DashboardController#index ( #9523 )
2018-12-14 20:36:18 +01:00
769c2d2680
Error message for avatar image that's too large. #9204 ( #9518 )
...
* Error message for avatar image that's too large. #9204
* Code climate/formatting
* Removed avatar error message
* Moved valid image dimentions check to update service
* removed unnescessary begin block
* code climate formatting
* code climate indent fix
2018-12-14 05:07:21 +01:00
795bac44fd
Add spec for Settings::ExportsController#create ( #9512 )
2018-12-13 02:53:52 +01:00
7d00e4edbd
Make custom emoji domains case insensitive #9351 ( #9474 )
...
* Make custom emoji domains case sensitive #9351
* Fixup style in downcase_domain to comply with codeclimate.
* switch if! to unless
* Don't use transactions, operate in batches.
Also revert spurious schema change.
2018-12-11 05:30:57 +01:00
dbb1ee269f
Improve e-mail MX validator and add tests ( #9489 )
2018-12-10 22:53:25 +01:00
ed24bb2c3e
Add specs for activitypub collections controller ( #9484 )
...
* Add specs for ActivityPub::CollectionsController#show
* Raise ActiveRecord::RecordNotFound
Raising ActiveRecord::NotFound raises NameError: uninitialized constant
ActiveRecord::NotFound.
2018-12-10 21:39:25 +01:00
6eae8f77af
Add spec for Admin::SuspentionsController#new ( #9483 )
2018-12-10 21:38:21 +01:00
361818e931
Fix Admin::TagsController#unhide ( #9481 )
2018-12-10 21:37:38 +01:00
ae3d2f446a
Add specs for Admin::InvitesController ( #9471 )
2018-12-10 01:19:28 +09:00
e7f1bfdc2d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb
Moved public.js changes to settings.js.
2018-12-09 16:08:04 +01:00
dfd123d5b3
Remove pending spec ( #9453 )
2018-12-07 16:53:55 +01:00
d3547fa005
Add specs for ActivityPub::InboxesController ( #9456 )
2018-12-07 16:40:01 +01:00
88b3eed16f
Add specs for Admin::AccountModerationNotesHelper ( #9455 )
2018-12-07 16:39:20 +01:00
57bb62d5cf
Remove pending spec ( #9454 )
...
Since dots are not allowed in username,
this spec is no longer needed.
2018-12-07 16:38:50 +01:00
51cbd045da
Add specs for AccountTagStat model ( #9452 )
2018-12-07 16:37:56 +01:00
73be8f38c1
Add profile directory ( #9427 )
...
Fix #5578
2018-12-06 17:36:11 +01:00
1df392819d
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-06 12:44:38 +01:00
155cf12680
Remove pending spec ( #9442 )
...
`#from_account` isn't defined.
2018-12-06 17:39:15 +09:00
e2910dff12
Add spec for Identity.find_for_oauth ( #9441 )
2018-12-06 17:38:49 +09:00
e88c6a5c3c
Fix thread depth computation in statuses_controller ( #9426 )
...
* Add test that should currently fail
* Fix depth computation (will still fail if statuses have been filtered out)
* Fix handling of broken threads
2018-12-05 02:12:29 +01:00
6b22845039
Add specs for list replies policy
2018-11-28 14:46:07 +01:00
Thibaut Girka
Eugen Rochko
ysksn
Sumit Khanna
Adam Copp