7dbf1ffa86
Merge branch 'fix/ecto_ssl_option' into 'develop'
...
Fix ssl option on Ecto config breaking release
See merge request pleroma/pleroma!2307
5 years ago
4633793bc1
Merge branch 'relationship-remove-outdated-hack' into 'develop'
...
Mastodon API Account view: Remove an outdated hack
See merge request pleroma/pleroma!2321
5 years ago
981e015f1b
Mastodon API Account view: Remove an outdated hack
...
The hack with caching the follow relationship was introduced
when we still were storing it inside the follow activity, resulting in
slow queries. Now we store follow state in `FollowRelationship` table,
so this is no longer necessary.
5 years ago
7f9b5284fa
updating clear_config
5 years ago
9bae9b1b1b
Merge branch 'develop' into gun
5 years ago
d74405fc1a
Merge branch 'fix-feed-pagination' into 'develop'
...
Fix for feed page pagination
Closes #1605
See merge request pleroma/pleroma!2281
5 years ago
d23e81903d
Merge branch 'clear-config-test-improvements' into 'develop'
...
Improved in-test config management
See merge request pleroma/pleroma!2312
5 years ago
1c05f539aa
Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
5 years ago
0e27c274f4
Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements
...
# Conflicts:
# test/web/mastodon_api/controllers/account_controller_test.exs
5 years ago
5efa5b0c4a
Merge branch 'feature/1206-restrict-unauthenticated' into 'develop'
...
restrict_unauthenticated setting
Closes #1206
See merge request pleroma/pleroma!2318
5 years ago
6c1232b486
NotificationController: Fix test.
5 years ago
1aa8aa7d7f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
fe15f0ba15
restrict_unauthenticated setting
5 years ago
d63dca8d99
Merge branch 'feature/1635-notifications-include-types' into 'develop'
...
include_types parameter in /api/v1/notifications
Closes #1635
See merge request pleroma/pleroma!2311
5 years ago
98a60df41f
include_types parameter in /api/v1/notifications
5 years ago
a8aa917530
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity
5 years ago
952cb589f4
Merge branch 'fix-testing' into 'develop'
...
Fix CI by temporarily removing federated testing
See merge request pleroma/pleroma!2314
5 years ago
c1fd4f6653
transmogrifier.ex: rework fix_attachment for better IR
5 years ago
9b9d67bbec
Fix linting.
5 years ago
3c2c32b460
Merge branch 'remake-remodel' into develop
5 years ago
a8c6933ca0
remove federated testing
5 years ago
7d275970ab
Add emoji reactions to features in nodeinfo
5 years ago
f9d622d25a
WIP
5 years ago
ec3719f539
Improved in-test config management functions.
5 years ago
51ce0813d3
Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into gun
5 years ago
f9ecb513fa
Merge branch 'develop' into gun
5 years ago
69341cbcba
Merge branch 'feature/1530-removing-with_move' into 'develop'
...
Feature/1530 removing with move
Closes #1530
See merge request pleroma/pleroma!2306
5 years ago
d3cf7e19fb
activity_pub_controller_test.exs: test posting with AP C2S uploaded media
5 years ago
4705590f76
Fix ssl option on Ecto config breaking release
...
To use `:ssl` option on Ecto config it's required to include Erlang ssl
application, this prevents releases to start when `:ssl` option is set
to true.
5 years ago
b17d8d305f
Enable Gun adapter by default
...
We need devs to dogfood this before we merge it into the 2.1 release
5 years ago
7438833685
[ #1364 ] Improved notification-related tests.
5 years ago
13cce9c0de
Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
5 years ago
e4380afc18
Merge branch 'docs/mrf_object_age' into 'develop'
...
Improve documentation of mrf_object_age
See merge request pleroma/pleroma!2305
5 years ago
d198e7fa2a
Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`
5 years ago
f3791add99
removing with_move parameter
5 years ago
8dd01b24d2
Improve documentation of mrf_object_age
5 years ago
0e07c5ef57
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
5 years ago
b80958d4e3
Merge branch 'feat/templates' into 'develop'
...
gitlab: create templates for bug reports and release MRs
See merge request pleroma/pleroma!2304
5 years ago
7829de6da4
gitlab: create templates for bug reports and release MRs
5 years ago
bf474ca3c1
fix
5 years ago
35471205f8
temp fix for `:gun.info` MatchError
5 years ago
3805e09b9c
Merge branch 'develop' into gun
5 years ago
ac5c2b66b9
Merge branch 'fix-warnings-in-tests' into 'develop'
...
Warnings fix
See merge request pleroma/pleroma!2303
5 years ago
f0651730bd
Merge branch 'develop' into gun
5 years ago
dc2ec84c0f
warnings fix
5 years ago
c2527b8c63
Merge branch 'removing-deprecated' into 'develop'
...
Removing from descriptions.exs deprecated settings
See merge request pleroma/pleroma!2302
5 years ago
ba90a6d3e5
removing from descriptions.exs deprecated settings
5 years ago
89e4b3ebbd
fix for content-type header for tag feed
5 years ago
91870c8995
adding rss for user feed
5 years ago
26e2076659
fix for feed page pagination
5 years ago
rinpatch