aboutsummaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
2020-07-21Revert "Merge branch 'linkify' into 'develop'"lain
This reverts merge request !2677
2020-07-21added welcome emailMaksim Pechnikov
2020-07-19Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # mix.lock # test/web/media_proxy/media_proxy_test.exs
2020-07-16description.exs typofixesAlex Gleason
2020-07-16Merge remote-tracking branch 'upstream/develop' into linkifyAlex Gleason
2020-07-15Merge branch 'develop' into refactor/gun-pool-registryMark Felder
2020-07-15Bring back oban job pruningrinpatch
Closes #1945
2020-07-15config.exs: set gun retries to 0rinpatch
The new pooling code just removes the connection when it's down, there is no need to reconnect a connection that is just sitting idle, better just open a new one next time it's needed
2020-07-15config.exs: make gun the default againrinpatch
2020-07-15Add documentation for new connection pool settings and remove somerinpatch
`:retry_timeout` and `:retry` got removed because reconnecting on failure is something the new pool intentionally doesn't do. `:max_overflow` had to go in favor of `:max_waiting`, I didn't reuse the key because the settings are very different in their behaviour. `:checkin_timeout` got removed in favor of `:connection_acquisition_wait`, I didn't reuse the key because the settings are somewhat different. I didn't do any migrations/deprecation warnings/changelog entries because these settings were never in stable.
2020-07-15HTTP: Implement max request limitsrinpatch
2020-07-15Refactor gun pooling and simplify adapter option insertionrinpatch
This patch refactors gun pooling to use Elixir process registry and simplifies adapter option insertion. Having the pool use process registry instead of a GenServer has a number of advantages: - Simpler code: the initial implementation adds about half the lines of code it deletes - Concurrency: unlike a GenServer, ETS-based registry can handle multiple checkout/checkin requests at the same time - Precise and easy idle connection clousure: current proposal for closing idle connections in the GenServer-based pool needs to filter through all connections once a minute and compare their last active time with closing time. With Elixir process registry this can be done by just using `Process.send_after`/`Process.cancel_timer` in the worker process. - Lower memory footprint: In my tests `gun-memory-leak` branch uses about 290mb on peak load (250 connections) and 235mb on idle (5-10 connections). Registry-based pool uses 210mb on idle and 240mb on peak load
2020-07-14Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-14Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'feld
Support for hosts with scheme in MediaProxy whitelist setting Closes #1922 See merge request pleroma/pleroma!2754
2020-07-14Clarify description and suggestionMark Felder
2020-07-14[#1940] Applied rate limit for requests with bad `admin_token`. Added doc ↵Ivan Tashkinov
warnings on `admin_token` setting.
2020-07-13Merge branch 'config-behaviours-runtime' into 'develop'feld
Config/Docs: Expand behaviour suggestions modules at runtime Closes #1941 See merge request pleroma/pleroma!2755
2020-07-13Merge branch 'fix/mediaproxy-cache-settings-types' into 'develop'feld
Update types for :headers and :options settings in Pleroma.Web.MediaProxy.Invalidation.Http See merge request pleroma/pleroma!2735
2020-07-12Add `account_approval_required` instance settingAlex Gleason
2020-07-12Config/Docs: Expand behaviour suggestions at runtimehref
2020-07-12MediaProxy whitelist setting now supports hosts with schemeAlexander Strizhakov
added deprecation warning about using bare domains
2020-07-12Update types in MRF Keyword groupAngelina Filippova
2020-07-11Remove :regex from typesAngelina Filippova
2020-07-11Update types for :params, :match_actor and :replace settingsAngelina Filippova
2020-07-10Merge branch 'issue/1790-updated-oban' into 'develop'feld
[#1790] updated oban to 2.0.0 See merge request pleroma/pleroma!2674
2020-07-10Merge branch 'develop' into issue/1790-updated-obanMark Felder
2020-07-10docs and descriptions for s3 settingsAlexander Strizhakov
2020-07-10Update type for :replace settingsAngelina Filippova
2020-07-10Update type for :groups settingAngelina Filippova
2020-07-09Merge branch 'features/favicons' into 'develop'lain
Add support for remote favicons See merge request pleroma/pleroma!2261
2020-07-09Update types for :headers and :options settings in MediaProxy Invalidation groupAngelina Filippova
2020-07-08Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'lain
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting Closes #1895 See merge request pleroma/pleroma!2731
2020-07-08Add [:instances_favicons, :enabled] setting, defaults to falseHaelwenn (lanodan) Monnier
2020-07-07Merge branch 'remove-twitter-api' into 'develop'lain
Remove some TwitterAPI endpoints See merge request pleroma/pleroma!2327
2020-07-07[#1895] Documentation hints on private instances and ↵Ivan Tashkinov
instance/restrict_unauthenticated setting.
2020-07-07added hyper:// to default protocolsDYM
2020-07-06Config: Remove Statusnet preloader.lain
2020-07-06Upload: Restrict description lengthlain
2020-07-03Merge branch 'develop' into issue/1790-updated-obanMark Felder
2020-07-02Lint, long linesMark Felder
2020-07-02Improve descriptions, move primary MRF settings to top for AdminFE orderingMark Felder
2020-07-02Merge branch 'develop' into feature/1885-MRF-metadataMark Felder
2020-07-02Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # lib/pleroma/web/media_proxy/media_proxy_controller.ex
2020-07-02Merge branch 'feature/update-description' into 'develop'lain
Update settings descriptions and labels See merge request pleroma/pleroma!2709
2020-07-01Add labels, update descriptions and labelsAngelina Filippova
2020-06-30AutoLinker --> Linkify, update to latest versionAlex Gleason
https://git.pleroma.social/pleroma/elixir-libraries/linkify
2020-06-27Config: Reduce default preloaders to configuration endpoints.lain
Fetching the timeline is a bit heavy to do by default.
2020-06-27added tab & labels for mrf policiesAlexander Strizhakov
2020-06-26additional data to MRF policies in descriptionsAlexander Strizhakov
2020-06-26Pleroma.Upload.Filter.Mogrify args descriptionAlexander Strizhakov