8bd7b9b586
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/models/user.rb
Resolved by adding :default_language to user settings fields
2018-06-21 20:49:57 +02:00
2828f36415
Add missing tests for confirmations controller ( #7866 )
2018-06-21 10:40:23 +09:00
8b44be1e7c
Add tests for shares_controller ( #7835 )
2018-06-18 10:45:20 +09:00
499a9f5f11
Change language opt-out to language opt-in ( #7823 )
...
* Switch filtered_languages to chosen_languages
* Adjust interface
* Remove unused translations
2018-06-17 13:54:02 +02:00
6e961f0731
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-06-14 06:17:24 +00:00
223b854b3b
Add tests for following accounts controller ( #7800 )
2018-06-14 10:49:17 +09:00
31cf3094fd
Add tests for followers_accounts_controller ( #7794 )
2018-06-13 10:28:39 +09:00
4692eed7bd
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
2018-06-12 18:13:30 -05:00
a130fcf7a9
keyword mute: Add missing scope for regex escape test
2018-06-12 17:48:38 -05:00
b8205550dd
keyword mute: use mentions scope in home feed filtering ( #454 )
...
If a status shows up in mentions because all keyword mutes that might
apply to it are marked as "don't apply to mentions", then it ought to
show up in the home feed also.
2018-06-12 17:14:35 -05:00
f9c8642a11
Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
...
Conflicts:
app/models/glitch/keyword_mute.rb
2018-06-12 16:39:30 -05:00
695674b2fa
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-06-12 13:17:21 +00:00
42ef87518d
Add missing tests for admin/accounts_controller ( #7791 )
2018-06-12 21:24:46 +09:00
d230066746
Add tests for intents_controller ( #7763 )
2018-06-09 22:47:50 +02:00
b051d74029
Fix domain hiding logic ( #7765 )
...
* Send rejections to followers when user hides domain they're on
* Use account domain blocks for "authorized followers" action
Replace soft-blocking (block & unblock) behaviour with follow rejection
* Split sync and async work of account domain blocking
Do not create domain block when removing followers by domain, that
is probably unexpected from the user's perspective.
* Adjust confirmation message for domain block
* yarn manage:translations
2018-06-09 22:46:54 +02:00
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
526f2f8e09
Add a FeedManager example demonstrating non-mention keywords. #454 .
2018-06-03 23:04:00 -05:00
a000085b9c
Fix spacing in some FeedManager examples.
2018-06-03 23:02:01 -05:00
2bb5842541
Thread scopes through #matches?. #454 .
...
Also add an apply_to_mentions attribute on Glitch::KeywordMute, which is
used to calculate scope. Next up: additions to the test suite to
demonstrate how scoping works.
2018-06-03 23:00:50 -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
Thibaut Girka