lain [Mon, 10 Jun 2019 13:03:48 +0000 (13:03 +0000)]
Merge branch 'feature/releases' into 'develop'
Releases
See merge request pleroma/pleroma!1261
lain [Mon, 10 Jun 2019 11:47:22 +0000 (11:47 +0000)]
Update pleroma_ctl
lain [Mon, 10 Jun 2019 11:34:11 +0000 (11:34 +0000)]
Merge branch 'issue/media-proxy-whitelist' into 'develop'
Add more tests for using media_proxy and whitelists
See merge request pleroma/pleroma!1262
Sergey Suprunenko [Mon, 10 Jun 2019 11:34:11 +0000 (11:34 +0000)]
Add more tests for using media_proxy and whitelists
rinpatch [Sun, 9 Jun 2019 10:56:41 +0000 (13:56 +0300)]
Add a changelog entry for releases
rinpatch [Sun, 9 Jun 2019 10:55:32 +0000 (13:55 +0300)]
Merge branch 'develop' into feature/releases
rinpatch [Sun, 9 Jun 2019 10:34:58 +0000 (13:34 +0300)]
specify that a version is needed for rollback
rinpatch [Sun, 9 Jun 2019 10:33:44 +0000 (13:33 +0300)]
Add migrate/rollback to release tasks
rinpatch [Sat, 8 Jun 2019 18:26:00 +0000 (21:26 +0300)]
Fix wrong placement of serve_endpoints
rinpatch [Sat, 8 Jun 2019 17:10:25 +0000 (20:10 +0300)]
Use Mix.shell().yes? if available
lain [Sat, 8 Jun 2019 16:05:10 +0000 (16:05 +0000)]
Merge branch 'prod-loglevel-warn' into 'develop'
Set default loglevel to `warn` in prod
Closes #962
See merge request pleroma/pleroma!1260
rinpatch [Sat, 8 Jun 2019 15:02:57 +0000 (18:02 +0300)]
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
rinpatch [Sat, 8 Jun 2019 14:40:40 +0000 (17:40 +0300)]
Make mix tasks work in a release
rinpatch [Sat, 8 Jun 2019 14:17:28 +0000 (17:17 +0300)]
Set serve_endpoints to true in prod config as setting it in runtime
config would cause issues with mix tasks
rinpatch [Sat, 8 Jun 2019 14:17:10 +0000 (17:17 +0300)]
Load ex_syslog and copy pleroma_ctl
rinpatch [Sat, 8 Jun 2019 14:15:49 +0000 (17:15 +0300)]
Basic release skeleton
lain [Sat, 8 Jun 2019 10:22:15 +0000 (10:22 +0000)]
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
rinpatch [Sat, 8 Jun 2019 10:10:34 +0000 (10:10 +0000)]
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
rinpatch [Fri, 7 Jun 2019 17:48:25 +0000 (20:48 +0300)]
replace missing mock with a 404
rinpatch [Fri, 7 Jun 2019 17:40:38 +0000 (20:40 +0300)]
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
lain [Fri, 7 Jun 2019 15:31:21 +0000 (17:31 +0200)]
Emoji: Use full path to check if a file is a directory.
kaniini [Fri, 7 Jun 2019 10:58:09 +0000 (10:58 +0000)]
Merge branch 'fix/replace-mix-env' into 'develop'
Replace Mix.env with Pleroma.Config.get(:env)
See merge request pleroma/pleroma!1254
kaniini [Fri, 7 Jun 2019 10:56:38 +0000 (10:56 +0000)]
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
rinpatch [Fri, 7 Jun 2019 09:37:20 +0000 (12:37 +0300)]
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.
rinpatch [Thu, 6 Jun 2019 20:59:51 +0000 (23:59 +0300)]
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.
kaniini [Thu, 6 Jun 2019 14:54:29 +0000 (14:54 +0000)]
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
rinpatch [Thu, 6 Jun 2019 14:26:19 +0000 (14:26 +0000)]
Merge branch 'fix-search' into 'develop'
Fix search
Closes #960
See merge request pleroma/pleroma!1253
lain [Thu, 6 Jun 2019 14:18:27 +0000 (16:18 +0200)]
User Search: Boost friends more strongly.
lain [Thu, 6 Jun 2019 14:16:22 +0000 (16:16 +0200)]
MastodonAPI: Add test for user search.
rinpatch [Thu, 6 Jun 2019 13:36:56 +0000 (16:36 +0300)]
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
rinpatch [Thu, 6 Jun 2019 12:17:49 +0000 (12:17 +0000)]
Merge branch 'improve-search' into 'develop'
[#943] Make the unauthenticated users limitation optional
See merge request pleroma/pleroma!1251
Egor [Thu, 6 Jun 2019 12:17:49 +0000 (12:17 +0000)]
[#943] Make the unauthenticated users limitation optional
kaniini [Wed, 5 Jun 2019 15:52:40 +0000 (15:52 +0000)]
Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
Bugfix/377 stuck follow request
Closes #377
See merge request pleroma/pleroma!1250
kaniini [Wed, 5 Jun 2019 15:51:32 +0000 (15:51 +0000)]
Merge branch 'improve-search' into 'develop'
[#943] Contain search for unauthenticated users
See merge request pleroma/pleroma!1220
lain [Wed, 5 Jun 2019 14:51:28 +0000 (16:51 +0200)]
Utils: Use update_follow_state_for_all when appropriate.
lain [Wed, 5 Jun 2019 14:43:35 +0000 (16:43 +0200)]
Utils: Split update_follow_state and update_follow_state_for_all.
lain [Wed, 5 Jun 2019 13:43:54 +0000 (15:43 +0200)]
CommonAPI: Add test for accept_follow_request.
lain [Wed, 5 Jun 2019 12:24:31 +0000 (14:24 +0200)]
User: Remove superfluous `maybe_follow`.
lain [Wed, 5 Jun 2019 12:10:46 +0000 (14:10 +0200)]
Transmogrifier: Add tests for incoming follows to locked accounts.
rinpatch [Wed, 5 Jun 2019 11:07:54 +0000 (11:07 +0000)]
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
lain [Wed, 5 Jun 2019 11:05:32 +0000 (11:05 +0000)]
Merge branch 'oauth_consumer_support_code' into 'develop'
OAuth consumer: tests fix, comments, Keycloak config notes
See merge request pleroma/pleroma!1248
lain [Wed, 5 Jun 2019 10:45:28 +0000 (12:45 +0200)]
Typo + Linting.
lain [Wed, 5 Jun 2019 10:06:45 +0000 (12:06 +0200)]
User: Don't error out when following a user that's already followed.
This leads to a few situations where it is impossible to follow a user.
Ivan Tashkinov [Wed, 5 Jun 2019 10:02:13 +0000 (13:02 +0300)]
OAuth consumer: tests fix, comments, Keycloak config notes.
Egor Kislitsyn [Wed, 5 Jun 2019 09:55:17 +0000 (16:55 +0700)]
Fix formatting
Egor Kislitsyn [Wed, 5 Jun 2019 09:34:14 +0000 (16:34 +0700)]
Limit search for unauthenticated users to local users only
Egor Kislitsyn [Mon, 3 Jun 2019 11:57:24 +0000 (18:57 +0700)]
Create index on `activities.local`
Egor Kislitsyn [Fri, 31 May 2019 10:11:45 +0000 (17:11 +0700)]
Fix tests with enabled RUM
Egor Kislitsyn [Fri, 31 May 2019 09:37:33 +0000 (16:37 +0700)]
Update benchmark mix task
Egor Kislitsyn [Fri, 31 May 2019 09:22:13 +0000 (16:22 +0700)]
Contain search for unauthenticated users
kaniini [Wed, 5 Jun 2019 08:28:20 +0000 (08:28 +0000)]
Merge branch 'explicit-addressing' into 'develop'
Explicit addressing
See merge request pleroma/pleroma!1239
Haelwenn [Tue, 4 Jun 2019 15:46:38 +0000 (15:46 +0000)]
Merge branch 'remove-tag-warning' into 'develop'
Mix: Swallow git error messages during version number handling.
See merge request pleroma/pleroma!1247
Haelwenn [Tue, 4 Jun 2019 15:34:55 +0000 (15:34 +0000)]
Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'
Participations: Filter out participations without activities.
Closes #956 and #953
See merge request pleroma/pleroma!1246
lain [Tue, 4 Jun 2019 15:10:54 +0000 (17:10 +0200)]
NodeInfo: Add explicit addressing to nodeinfo.
lain [Tue, 4 Jun 2019 14:44:56 +0000 (16:44 +0200)]
Mix: Swallow git error messages during version number handling.
Otherwise sometimes a 'fatal' message will be printed, confusing users.
lain [Tue, 4 Jun 2019 14:58:13 +0000 (14:58 +0000)]
Merge branch 'issue/941' into 'develop'
[#941] add option skip_thread_containment
See merge request pleroma/pleroma!1237
Maksim Pechnikov [Tue, 4 Jun 2019 12:20:24 +0000 (15:20 +0300)]
update ActivityPub#fetch_activities_query
Maksim Pechnikov [Tue, 4 Jun 2019 12:06:58 +0000 (15:06 +0300)]
Merge branch 'develop' into issue/941
Maksim Pechnikov [Tue, 4 Jun 2019 12:04:36 +0000 (15:04 +0300)]
update ActivityPub#fetch_activities_query
lain [Tue, 4 Jun 2019 11:58:36 +0000 (13:58 +0200)]
Participations: Filter out participations without activities.
Haelwenn [Tue, 4 Jun 2019 11:26:42 +0000 (11:26 +0000)]
Merge branch 'emoji-loader-fix' into 'develop'
Emoji: Don't die when files are present in the emoji folder.
Closes #957
See merge request pleroma/pleroma!1245
lain [Tue, 4 Jun 2019 10:55:45 +0000 (10:55 +0000)]
Merge branch 'fix/fetch-votes-restrict-create' into 'develop'
Restrict `get_existing_votes` to only get Create activities
See merge request pleroma/pleroma!1244
rinpatch [Tue, 4 Jun 2019 10:47:53 +0000 (13:47 +0300)]
Add tests for get_existing_votes
rinpatch [Tue, 4 Jun 2019 10:38:24 +0000 (13:38 +0300)]
Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities
lain [Tue, 4 Jun 2019 10:01:21 +0000 (12:01 +0200)]
Emoji: Don't die when files are present in the emoji folder.
rinpatch [Tue, 4 Jun 2019 09:42:10 +0000 (12:42 +0300)]
Restrict `get_existing_votes` to only get Create activities
Maksim Pechnikov [Tue, 4 Jun 2019 09:41:24 +0000 (12:41 +0300)]
fix merge
lain [Tue, 4 Jun 2019 09:23:46 +0000 (11:23 +0200)]
Merge remote-tracking branch 'origin/develop' into explicit-addressing
kaniini [Tue, 4 Jun 2019 08:55:04 +0000 (08:55 +0000)]
Merge branch 'fix/poll-performance' into 'develop'
utils: access inReplyTo as an explicit string when fetching poll results`
See merge request pleroma/pleroma!1243
lain [Tue, 4 Jun 2019 08:49:57 +0000 (10:49 +0200)]
Docs: Add Explicit addressing to Readme and changelog.
William Pitcock [Tue, 4 Jun 2019 08:45:03 +0000 (08:45 +0000)]
utils: access inReplyTo as an explicit string when fetching poll results`
Maksim Pechnikov [Tue, 4 Jun 2019 06:49:08 +0000 (09:49 +0300)]
Merge branch 'develop' into issue/941
kaniini [Tue, 4 Jun 2019 06:29:03 +0000 (06:29 +0000)]
Merge branch 'feature/nodeinfo-polls' into 'develop'
nodeinfo: add pollLimits to metadata
See merge request pleroma/pleroma!1242
William Pitcock [Tue, 4 Jun 2019 06:19:44 +0000 (06:19 +0000)]
nodeinfo: add pollLimits to metadata
kaniini [Tue, 4 Jun 2019 05:49:54 +0000 (05:49 +0000)]
Merge branch 'feature/mrf-subchain' into 'develop'
MRF: subchain policy
See merge request pleroma/pleroma!1233
kaniini [Tue, 4 Jun 2019 05:46:20 +0000 (05:46 +0000)]
Merge branch 'fix/mock-errors-in-tests' into 'develop'
Add missing HTTP Request mocks
See merge request pleroma/pleroma!1231
Sergey Suprunenko [Tue, 4 Jun 2019 05:46:19 +0000 (05:46 +0000)]
Add missing HTTP Request mocks
kaniini [Tue, 4 Jun 2019 05:43:43 +0000 (05:43 +0000)]
Merge branch 'generic-fe-settings' into 'develop'
Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221
kaniini [Tue, 4 Jun 2019 05:42:49 +0000 (05:42 +0000)]
Merge branch 'ueberauth_config_extension' into 'develop'
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification
See merge request pleroma/pleroma!1234
kaniini [Tue, 4 Jun 2019 05:39:38 +0000 (05:39 +0000)]
Merge branch 'update-oauth-template-css-fix' into 'develop'
Update oauth template css fix
See merge request pleroma/pleroma!1238
kaniini [Tue, 4 Jun 2019 05:38:13 +0000 (05:38 +0000)]
Merge branch 'hotfix/add-in_reply_to_index' into 'develop'
Add index on inReplyTo for objects
See merge request pleroma/pleroma!1240
William Pitcock [Tue, 4 Jun 2019 05:37:31 +0000 (05:37 +0000)]
update CHANGELOG for mrf_subchain
Maksim Pechnikov [Mon, 3 Jun 2019 19:51:14 +0000 (22:51 +0300)]
fix tests
lambda [Mon, 3 Jun 2019 19:03:35 +0000 (19:03 +0000)]
Merge branch 'fix/tag-timeline-missing-index' into 'develop'
Add missing tag index on objects
Closes #867
See merge request pleroma/pleroma!1241
Maksim Pechnikov [Mon, 3 Jun 2019 18:05:45 +0000 (21:05 +0300)]
updated changelog
Maksim Pechnikov [Mon, 3 Jun 2019 18:02:02 +0000 (21:02 +0300)]
update api to set skip_thread_containment
rinpatch [Mon, 3 Jun 2019 17:42:08 +0000 (20:42 +0300)]
Add missing tag index on objects
The previous activity index is useless because objects are not embedded
anymore and instead a joined object is queried.
lain [Mon, 3 Jun 2019 17:08:38 +0000 (19:08 +0200)]
CommonAPI.Utils: Add tests.
rinpatch [Mon, 3 Jun 2019 16:26:43 +0000 (19:26 +0300)]
Add index on inReplyTo for objects
Fixes the performance of `get_existing_votes`
eugenijm [Mon, 3 Jun 2019 15:58:04 +0000 (18:58 +0300)]
Remove repeated scope lists
lain [Mon, 3 Jun 2019 16:17:08 +0000 (18:17 +0200)]
CommonAPI: Add explicit addressing.
lain [Mon, 3 Jun 2019 16:16:11 +0000 (18:16 +0200)]
User: Add function to get AP ids from nicknames.
eugenijm [Mon, 3 Jun 2019 15:00:32 +0000 (18:00 +0300)]
Use workaround for the heavy checkmark symbol in iOS
Mark Felder [Mon, 3 Jun 2019 14:12:17 +0000 (09:12 -0500)]
Merge branch 'develop' into update-oauth-template
Maksim Pechnikov [Mon, 3 Jun 2019 13:04:39 +0000 (16:04 +0300)]
add option skip_thread_containment
rinpatch [Mon, 3 Jun 2019 12:19:19 +0000 (12:19 +0000)]
Merge branch 'feature/polls-2-electric-boogalo' into 'develop'
Polls 2 Electric Boogalo
Closes #657
See merge request pleroma/pleroma!1190
rinpatch [Mon, 3 Jun 2019 10:16:17 +0000 (13:16 +0300)]
Merge branch 'develop' into feature/polls-2-electric-boogalo
rinpatch [Mon, 3 Jun 2019 10:15:18 +0000 (10:15 +0000)]
Merge branch 'fix-dokku' into 'develop'
Fix dokku
See merge request pleroma/pleroma!1236
lain [Mon, 3 Jun 2019 09:47:10 +0000 (11:47 +0200)]
CI: Actually push to correct repo.
lambda [Mon, 3 Jun 2019 09:48:37 +0000 (09:48 +0000)]
Merge branch 'align-mastodon-conversations' into 'develop'
Mastodon Conversations API: Align to Mastodon behavior
See merge request pleroma/pleroma!1215
projects / akkoma / log