74be4de3f6
Merge branch 'fix/2209-remoteip' into 'develop'
...
#2209 RemoteIP CIDR helper, config and doc improvements
See merge request pleroma/pleroma!3057
2020-10-08 17:29:00 +00:00
ed6511a086
Lint
2020-10-07 15:28:29 -05:00
a702f9fb5b
Lint
2020-10-07 15:07:03 -05:00
822e4472f3
Fix incorrect use of connect/1
...
Hint from Phoenix 1.4.17, which has a connect/7 shim:
lib/phoenix/socket/transport.ex:
def connect(endpoint, handler, _transport_name, transport, serializers, params, _pid \\ self()) do
IO.warn "Phoenix.Socket.Transport.connect/7 is deprecated"
handler.connect(%{
endpoint: endpoint,
transport: transport,
options: [serializer: serializers],
params: params
})
end
2020-10-07 15:06:16 -05:00
6ee20eb328
Apply 1 suggestion(s) to 1 file(s)
2020-10-07 19:32:42 +00:00
8bfc5d9a0c
Apply 1 suggestion(s) to 1 file(s)
2020-10-07 19:32:09 +00:00
d0eca5b125
Apply 2 suggestion(s) to 2 file(s)
2020-10-07 19:16:53 +00:00
8156940a49
Compatibility with phoenix_pubsub 2.0.0
2020-10-07 13:28:39 -05:00
70880d54f8
@env is not used
2020-10-07 12:55:16 -05:00
42e78a08b2
Fix rendering of reports
2020-10-07 12:30:55 -05:00
87fc5a40f4
instrumenters has no effect in Endpoint anymore
2020-10-07 11:52:23 -05:00
8caa6cf91d
Transport.connect/7 is deprecated
2020-10-07 11:47:10 -05:00
b0198d3435
Merge branch 'chore/elixir-1.11' of git.pleroma.social:pleroma/pleroma into chore/elixir-1.11
2020-10-07 11:45:11 -05:00
6d1666a080
Apply 1 suggestion(s) to 1 file(s)
2020-10-07 16:44:52 +00:00
fddea9e3ce
:pubsub is deprecated and replaced wit :pubsub_server
2020-10-07 10:34:24 -05:00
570a406b7a
use Phoenix.ConnTest is deprecated
2020-10-07 10:31:08 -05:00
f3bc076f09
Temporarily soft-fork prometheus_ex
2020-10-07 10:23:20 -05:00
218a3e61e1
Fix incompatible types warning (Elixir 1.11)
2020-10-07 10:04:25 -05:00
d3106c69c8
Fix incompatible type (Elixir 1.11)
2020-10-07 10:02:20 -05:00
636c00037d
Fix duplicate @doc entries
2020-10-07 09:58:45 -05:00
268f7f492a
Update Phoenix and pubsub to solve all the System.stacktrace/0 deprecation warnings
2020-10-07 09:50:51 -05:00
b90eda3d8b
Improve description yet again
2020-10-06 17:36:29 -05:00
e08eb4aba0
Don't leak internal variables in the docs. They're useless to users.
2020-10-06 17:29:56 -05:00
7a2ed2fc90
Credo
2020-10-06 17:26:31 -05:00
b8c05f4876
Improve descriptions for reserved and proxies
2020-10-06 17:21:27 -05:00
9783e9cd80
Add test for an entry without CIDR format
2020-10-06 17:08:26 -05:00
d43d05005a
Move hardcoded default configuration into config.exs
2020-10-06 17:02:46 -05:00
7aff2b47c5
Fix docs for default headers used by RemoteIp. We only use X-Forwarded-For by default.
2020-10-06 15:47:11 -05:00
f9ece1a7f6
Merge branch 'revert/rich-media-censorship' into 'develop'
...
#2192 Revert Rich Media censorship for sensitive statuses
See merge request pleroma/pleroma!3044
2020-10-06 20:19:39 +00:00
21a73ce9f2
Document the NSFW link preview change
2020-10-06 14:54:21 -05:00
cddca85c84
Merge branch 'develop' into revert/rich-media-censorship
2020-10-06 14:25:20 -05:00
2698bbc9f6
Merge branch 'filtering-following' into 'develop'
...
ActivityPub: Return Announces when filtering by `following`.
See merge request pleroma/pleroma!3022
2020-10-06 18:11:34 +00:00
0a69dbc97c
Merge branch 'feature/update-description-for-frontends-setting' into 'develop'
...
Remove extra nesting and add labels in `:frontends` setting
See merge request pleroma/pleroma!3043
2020-10-06 18:05:03 +00:00
6c2264af24
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
2020-10-05 23:50:08 +03:00
094edde7c4
[ #3053 ] Unauthenticated access control for OStatus-related controllers and ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.
2020-10-05 23:48:00 +03:00
f497eb034d
activity_pub_controller.ex: Remove unused @doc block
...
[ci skip]
2020-10-05 21:11:00 +02:00
4d852f3e78
Merge branch 'feature/1893-remote-emoji-packs-pagination' into 'develop'
...
Feature/1893 remote emoji packs pagination
Closes #1893
See merge request pleroma/pleroma!2698
2020-10-05 17:52:02 +00:00
346cc3ac24
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
2020-10-05 12:40:53 -05:00
35ee759e74
Add helper function to convert single IPs into CIDR format if they were not provided that way
2020-10-05 11:49:56 -05:00
4c229d7fcc
docs/ap_extensions.md: Add JSON-LD full names
2020-10-05 17:36:12 +02:00
ac6e0f6684
docs/ap_extensions.md: document oauthRegistrationEndpoint
2020-10-05 17:19:21 +02:00
858dbe4360
docs/ap_extensions.md: document uploadMedia
2020-10-05 17:14:22 +02:00
4b05eb9a32
Merge branch '2211-smol-documentation-fix' into 'develop'
...
Docs: Modify docs so the postgres config is harder to get wrong.
Closes #2211
See merge request pleroma/pleroma!3055
2020-10-05 14:53:30 +00:00
8d093a68a6
Docs: Modify docs so the postgres config is harder to get wrong.
2020-10-05 13:58:12 +02:00
9e96c9ae48
Merge branch 'fix/empty-params-openapi' into 'develop'
...
OpenAPI CastAndValidate: filter out empty params
Closes #2198
See merge request pleroma/pleroma!3047
2020-10-03 12:35:49 +00:00
f6024252ae
[ #3053 ] No auth check in StaticFEController, even on non-federating instances. Adjusted tests.
2020-10-02 22:18:02 +03:00
0d575735bf
No auth check in UserController.feed_redirect/2, even on non-federating instances.
2020-10-01 21:41:22 +03:00
7efadc3cbd
No auth check in OStatusController, even on non-federating instances.
2020-10-01 21:34:45 +03:00
241f7cb1ed
Merge branch 'web-push-fix' into 'develop'
...
web push http_client fix
Closes #2202
See merge request pleroma/pleroma!3052
2020-10-01 11:15:13 +00:00
cbdaabad34
web push http_client fix
2020-10-01 13:32:11 +03:00
Haelwenn