c2f7676dfc
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
app/models/status.rb
The conflict in the Status model was due to
3114ac9655
2018-06-07 05:13:49 -05:00
f0022a4ddc
Add missing tests for sessions controller ( #7744 )
2018-06-06 10:23:22 +09:00
9f9aa39eb5
Escape metacharacters in non-whole-word keyword mutes. Fixes #533 .
...
Also addresses #463 .
2018-06-05 02:49:28 -05:00
6dfc8999f7
Add tests for embeds controller ( #7719 )
...
* Small refactoring of status_finder_spec
* Add tests for embeds_controller
2018-06-04 10:35:56 +09:00
827d1ea864
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
The above conflicts appear to be a text conflict introduced by
glitch-soc's additional level of columns (i.e. moving a bunch of columns
under the Misc option). They were resolved via accept-ours.
2018-06-02 16:15:36 -05:00
1f622bff18
Add tests for migrations_controller ( #7707 )
2018-06-02 18:52:16 +09:00
a76f40890e
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-31 01:17:25 +00:00
9e3f9b8250
Improve counter caches on Status and Account ( #7644 )
...
Do not touch statuses_count on accounts table when mass-destroying
statuses to reduce load when removing accounts, same for
reblogs_count and favourites_count
Do not count statuses with direct visibility in statuses_count
Fix #828
2018-05-30 02:50:23 +02:00
c822ecfa01
Merge branch 'master' into glitch-soc/merge-upstream
2018-05-29 13:52:26 +02:00
8bf3eb0571
Add a test for emojis_controller ( #7652 )
2018-05-28 22:56:58 +09:00
9a4bed4837
optimize direct timeline ( #7614 )
...
* optimize direct timeline
* fix typo in class name
* change filter condition for direct timeline
* fix codestyle issue
* revoke index_accounts_not_silenced because direct timeline does not use it.
* revoke index_accounts_not_silenced because direct timeline does not use it.
* fix rspec test condition.
* fix rspec test condition.
* fix rspec test condition.
* revoke adding column and partial index
* (direct timeline) move merging logic to model
* fix pagination parameter
* add method arguments that switches return array of status or cache_ids
* fix order by
* returns ActiveRecord.Relation in default behavor
* fix codestyle issue
2018-05-28 11:04:06 +02:00
28ccf0a464
Merge branch 'master' into glitch-soc/merge-upstream
2018-05-23 16:05:19 +02:00
c0b945b77e
Fix tests for invites controller (regression from 32c3fc08fe) ( #7597 )
2018-05-23 06:32:10 +02:00
0a5527319a
Add tests for report notes controller ( #7589 )
2018-05-22 14:45:10 +02:00
c384e0f3de
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/simple_form.ja.yml
2018-05-19 22:41:10 +02:00
7eaa12c83a
Ensure push subscription is immediately removed when application is revoked ( #7548 )
...
* Ensure push subscription is immediately removed when application is revoked
* When token is revoked from app, unsubscribe too
2018-05-19 21:05:08 +02:00
3c3e6d0e9b
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/controllers/settings/preferences_controller.rb
app/lib/user_settings_decorator.rb
app/models/user.rb
config/locales/simple_form.en.yml
2018-05-18 08:47:10 -05:00
1de7400dfc
Resolve unknown status from Add activity, skip Remove if unknown ( #7526 )
...
Fix #7518
2018-05-18 11:33:56 +02:00
c91bd06fa5
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-17 11:17:21 +00:00
6800e195a4
Add tests for account_moderation_notes_controller ( #7524 )
2018-05-17 04:26:51 +02:00
d0b753db6b
Merge branch 'master' into glitch-soc/merge
...
Conflicts:
app/controllers/invites_controller.rb
app/serializers/initial_state_serializer.rb
config/locales/ko.yml
2018-05-11 18:12:42 +02:00
fd0f2b675e
Add tests for invites controller ( #7441 )
...
* Add tests for invites controller
* Small refactoring and fix for invites controller
2018-05-11 13:14:33 +02:00
e86a4fe36b
Add REST API for Web Push Notifications subscriptions ( #7445 )
...
- POST /api/v1/push/subscription
- PUT /api/v1/push/subscription
- DELETE /api/v1/push/subscription
- New OAuth scope: "push" (required for the above methods)
2018-05-11 11:49:12 +02:00
af504e62ff
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
e60292c616
Disable simplecov on CircleCI ( #7416 )
...
* Disable simplecov on CircleCI
* Remove --format progress
2018-05-09 16:59:58 +02:00
fcac2f1b60
Add tests for admin/roles_controller ( #7421 )
2018-05-09 08:41:46 +02:00
db644968ce
Add tests for admin/invites_controller ( #7412 )
2018-05-09 08:41:26 +02:00
a2b84b644b
Take the first recognized actor_type. ( #7410 )
2018-05-08 13:30:04 +02:00
8c8a850f8a
Add resend confirmation for admin ( #7378 )
...
* Add confirmations_controller#resend
* Add tests for confirmations_controller#resend
* Add translations
2018-05-06 10:59:03 +02:00
9d64bcdac7
Port travis_retry for CI ( #7379 )
...
* Port travis_retry for CI
* Add license
2018-05-06 10:55:50 +02:00
0dcca6b6e8
Improve admin UI for accounts ( #7360 )
...
* Improve design of account statuses admin UI (consistent with reports)
* Make account moderation notes look consistent with report notes
* i18n-tasks remove-unused
* Fix code style issues
* Fix tests
2018-05-05 23:06:29 +02:00
de918cee5a
Add tests for admin/custom_emojis_controller ( #7350 )
2018-05-05 15:53:59 +02:00
8913ccb434
Store home feeds for 7 days instead of 14 ( #7354 )
...
* Store home feeds for 7 days instead of 14
Reduces workload for status fan-out to active followers
* Fix test for user model
2018-05-05 00:54:24 +02:00
087c79669a
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
db/schema.rb
2018-05-04 14:16:30 -05:00
154076e8e7
Store URIs of follows, follow requests and blocks for ActivityPub ( #7160 )
...
Same URI passed between follow request and follow, since they are
the same thing in ActivityPub. Local URIs are generated during
creation using UUIDs and are passed to serializers.
2018-05-04 21:14:34 +02:00
c87f1d99e4
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
.travis.yml
Gemfile.lock
README.md
app/controllers/settings/follower_domains_controller.rb
app/controllers/statuses_controller.rb
app/javascript/mastodon/locales/ja.json
app/lib/feed_manager.rb
app/models/media_attachment.rb
app/models/mute.rb
app/models/status.rb
app/services/mute_service.rb
app/views/home/index.html.haml
app/views/stream_entries/_simple_status.html.haml
config/locales/ca.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
config/locales/nl.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/themes.yml
2018-05-03 17:23:44 -05:00
995d9e8485
Add missing tests for report.rb ( #7324 )
2018-05-03 10:42:36 +02:00
68ba4f23e0
Serialize webfinger XML with Ox instead of Nokogiri ( #7319 )
...
25ms -> 0.5ms
2018-05-02 22:28:46 +02:00
ca1c696dbd
Slightly reduce RAM usage ( #7301 )
...
* No need to re-require sidekiq plugins, they are required via Gemfile
* Add derailed_benchmarks tool, no need to require TTY gems in Gemfile
* Replace ruby-oembed with FetchOEmbedService
Reduce startup by 45382 allocated objects
* Remove preloaded JSON-LD in favour of caching HTTP responses
Reduce boot RAM by about 6 MiB
* Fix tests
* Fix test suite by stubbing out JSON-LD contexts
2018-05-02 18:58:48 +02:00
fcfc44de66
Keep notification when muting_notifications is true ( #7311 )
...
* Keep notification when muting_notifications is true
* Retrun mute object
* Fix test
2018-05-02 16:14:51 +02:00
d6a2530d73
Speed up test suite by not generating RSA keys in test environment ( #7296 )
...
One RSA keypair for all fabricated test accounts is enough
2018-05-02 15:45:24 +02:00
a110cce92b
Add missing tests for user.rb ( #7306 )
2018-05-02 14:13:52 +02:00
72793b3fc7
Support Actors/Statuses with multiple types ( #7305 )
...
* Add equals_or_includes_any? helper in JsonLdHelper
* Support arrays in JSON-LD type fields for actors/tags/objects.
* Spec for resolving accounts with extension types
* Style tweaks for codeclimate
2018-05-02 12:40:24 +02:00
e484bd61e0
Also treat non-whole-word mutes as case-insensitive. #450 .
2018-04-30 20:08:22 -05:00
50e673409f
Append '.test' to hostname in stub data ( #7260 )
2018-04-25 14:12:28 +02:00
1071ecfebc
Prevent suspended accounts from appearing in AccountSearchService ( #7246 )
2018-04-23 21:27:18 +02:00
e22f682df0
Paginate descendant statuses in public page ( #7148 )
2018-04-23 19:27:35 +02:00
599aa39aca
Remove "nsfw" category for sensitive statuses in OStatus serializer ( #7048 )
...
Fix #7011
2018-04-22 22:09:03 +02:00
32b71c8a25
Fix randomly fail (similar #7219 ) ( #7225 )
2018-04-22 11:41:39 +02:00
3637c4983b
Reset locale on registration tests ( #7219 )
2018-04-21 23:37:07 +02:00
David Yip