70edcd1386
Merge branch 'fix/warnings-in-migration' into 'develop'
...
Remove unused imports and aliases from migration
Closes #964
See merge request pleroma/pleroma!1263
2019-06-10 13:20:37 +00:00
a7d956d383
Remove unused imports and aliases from migration
2019-06-10 13:20:37 +00:00
8fd68b8039
Merge branch 'feature/releases' into 'develop'
...
Releases
See merge request pleroma/pleroma!1261
2019-06-10 13:03:48 +00:00
dbe4c2b7c8
Update pleroma_ctl
2019-06-10 11:47:22 +00:00
3d7bb47124
Merge branch 'issue/media-proxy-whitelist' into 'develop'
...
Add more tests for using media_proxy and whitelists
See merge request pleroma/pleroma!1262
2019-06-10 11:34:11 +00:00
365268d522
Add more tests for using media_proxy and whitelists
2019-06-10 11:34:11 +00:00
cfcc0c8776
Add a changelog entry for releases
2019-06-09 13:56:41 +03:00
3ecfe2a6d4
Merge branch 'develop' into feature/releases
2019-06-09 13:55:32 +03:00
bf391569cf
specify that a version is needed for rollback
2019-06-09 13:34:58 +03:00
2a659b35f1
Add migrate/rollback to release tasks
2019-06-09 13:33:44 +03:00
b6d2db42a7
Fix wrong placement of serve_endpoints
2019-06-08 21:27:39 +03:00
7223c1b643
Use Mix.shell().yes? if available
2019-06-08 20:10:48 +03:00
b9544d565d
Merge branch 'prod-loglevel-warn' into 'develop'
...
Set default loglevel to `warn` in prod
Closes #962
See merge request pleroma/pleroma!1260
2019-06-08 16:05:10 +00:00
4f5149c93b
Set default loglevel to `warn` in prod
...
It's rare that info logs are needed to debug the issue, so I would
suggest setting them to warn in prod by default to make finding the
relevant parts easier and potentially even decrease cpu usage on bigger
instances
Closes #962
2019-06-08 18:02:57 +03:00
d7ec0898e5
Make mix tasks work in a release
2019-06-08 17:40:40 +03:00
4b98a7ce4e
Set serve_endpoints to true in prod config as setting it in runtime
...
config would cause issues with mix tasks
2019-06-08 17:17:28 +03:00
c47dc0de2c
Load ex_syslog and copy pleroma_ctl
2019-06-08 17:17:10 +03:00
3d374bf7df
Basic release skeleton
2019-06-08 17:16:15 +03:00
1e0fa899b6
Merge branch 'fix/transmogrifier-inReplyTo' into 'develop'
...
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
See merge request pleroma/pleroma!1259
2019-06-08 10:22:15 +00:00
d7f4f65560
Merge branch 'bugfix/959-emoji-loading' into 'develop'
...
Emoji: Use full path to check if a file is a directory.
Closes #959
See merge request pleroma/pleroma!1257
2019-06-08 10:10:34 +00:00
dffc9f060a
replace missing mock with a 404
2019-06-07 20:48:25 +03:00
d020f68e87
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
2019-06-07 20:40:38 +03:00
970f71e222
Conversations: Fetch users in one query.
2019-06-07 17:51:47 +02:00
cb3258c863
Emoji: Use full path to check if a file is a directory.
2019-06-07 17:31:21 +02:00
76fc4c92bb
Fix tests.
2019-06-07 17:16:56 +02:00
593b8b1e6a
Configuration: Skip thread containment by default
...
In my tests the interaction between thread containment and other restrictions
makes postgresql create some very bad query plans. This caused direct messages
to time out on soykaf, for example.
2019-06-07 14:28:14 +02:00
d5330ed125
Merge branch 'fix/replace-mix-env' into 'develop'
...
Replace Mix.env with Pleroma.Config.get(:env)
See merge request pleroma/pleroma!1254
2019-06-07 10:58:09 +00:00
cb89987ca1
Merge branch 'fix/mix-tasks-ensure-no-endpoints-are-served' into 'develop'
...
Mix Tasks: Switch to Application.ensure_all_started instead of Mix.Task.run and ensure serve_endpoints is set to false
See merge request pleroma/pleroma!1255
2019-06-07 10:56:38 +00:00
bc597d888c
Mix Tasks: Switch to Application.ensure_all_started instead of
...
Mix.Task.run and ensure serve_endpoints is set to false
In release environments there is no Mix.Task.run and serve_endpoints
must be set to true for the endpoints to start, so we need to ensure it
is set to false before starting Pleroma for executing a mix task.
2019-06-07 12:37:20 +03:00
c0fa000147
Set default config for digest to false
2019-06-07 01:22:35 +03:00
01fe5abad1
Resolve conflicts
2019-06-07 01:20:50 +03:00
92213fb87c
Replace Mix.env with Pleroma.Config.get(:env)
...
Mix.env/0 is not availible in release environments such as distillery or
elixir's built-in releases.
2019-06-06 23:59:51 +03:00
62cdf701f4
Merge branch 'fix/elixir-master-deprecation-warnings' into 'develop'
...
Switch to manual Supervisor child specifications instead of Supervisor.Spec
See merge request pleroma/pleroma!1252
2019-06-06 14:54:29 +00:00
5f1b6f5aca
Merge branch 'fix-search' into 'develop'
...
Fix search
Closes #960
See merge request pleroma/pleroma!1253
2019-06-06 14:26:19 +00:00
cb2bcee842
User Search: Boost friends more strongly.
2019-06-06 16:18:27 +02:00
7e9f7ea0c2
MastodonAPI: Add test for user search.
2019-06-06 16:16:22 +02:00
9ae8f012a5
Switch to manual Supervisor child specifications instead of Supervisor.Spec
...
Supervisor.Spec is deprecated and causes warnings on Elixir master, see
https://hexdocs.pm/elixir/Supervisor.Spec.html
2019-06-06 16:37:44 +03:00
489bd30fb9
Merge branch 'improve-search' into 'develop'
...
[#943 ] Make the unauthenticated users limitation optional
See merge request pleroma/pleroma!1251
2019-06-06 12:17:49 +00:00
f82382de22
[ #943 ] Make the unauthenticated users limitation optional
2019-06-06 12:17:49 +00:00
3f6da9c45a
Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
...
Bugfix/377 stuck follow request
Closes #377
See merge request pleroma/pleroma!1250
2019-06-05 15:52:40 +00:00
a511d2f900
Merge branch 'improve-search' into 'develop'
...
[#943 ] Contain search for unauthenticated users
See merge request pleroma/pleroma!1220
2019-06-05 15:51:32 +00:00
e1370ba131
Utils: Use update_follow_state_for_all when appropriate.
2019-06-05 16:51:28 +02:00
ad19bfc7fe
Utils: Split update_follow_state and update_follow_state_for_all.
2019-06-05 16:43:35 +02:00
827a51e777
CommonAPI: Add test for accept_follow_request.
2019-06-05 15:45:16 +02:00
076c9ae40e
User: Remove superfluous `maybe_follow`.
2019-06-05 14:24:31 +02:00
3115b64cfe
Transmogrifier: Add tests for incoming follows to locked accounts.
2019-06-05 14:10:46 +02:00
50afe5ab9e
Merge branch 'fix-stuck-follows' into 'develop'
...
User: Don't error out when following a user that's already followed.
See merge request pleroma/pleroma!1249
2019-06-05 11:07:54 +00:00
eda4b00a6a
Merge branch 'oauth_consumer_support_code' into 'develop'
...
OAuth consumer: tests fix, comments, Keycloak config notes
See merge request pleroma/pleroma!1248
2019-06-05 11:05:32 +00:00
ddd4a09b72
Fix merge conflict
2019-06-05 17:55:00 +07:00
cfa5572d28
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-05 17:53:15 +07:00
lain