aboutsummaryrefslogtreecommitdiff
path: root/config/config.exs
AgeCommit message (Collapse)Author
2020-07-28Docs: Add frontend info to cheat sheet.lain
2020-07-27Add configurable registration_reason limitAlex Gleason
2020-07-27Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-26Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-23Merge branch 'develop' into issue/1934-welcome-emailMaksim Pechnikov
2020-07-22fix sender for welcome emailMaksim Pechnikov
2020-07-21Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"lain
This reverts merge request !2784
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-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-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-12Add `account_approval_required` instance settingAlex Gleason
2020-07-10Merge branch 'develop' into issue/1790-updated-obanMark Felder
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-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-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-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-25Merge branch 'preload-data' into 'develop'feld
Preload data into index.html Closes #1660 See merge request pleroma/pleroma!2381
2020-06-25added wrapper Pleroma.HTTP for ExAws.S3Maksim Pechnikov
2020-06-24added wrapper Pleroma.HTTP for Tzdata.HTTPClientMaksim Pechnikov
2020-06-23Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'Haelwenn
Moving mrf settings from instance to separate mrf group Closes #1631 See merge request pleroma/pleroma!2320
2020-06-23migrate to oban 2.0-rc1Maksim Pechnikov
2020-06-22Add missing default config value for :instance, instance_thumbnailMark Felder
Follows up on b7fc61e17b
2020-06-17Merge branch 'develop' into issue/1855Mark Felder
2020-06-16moving mrf settings from instance to separate groupAlexander Strizhakov
2020-06-16Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIMEhref
2020-06-16Pleroma.MIME: use gen_magichref
2020-06-15Merge branch 'develop' into issue/1855Maksim Pechnikov
2020-06-14fix invalidates media url'sMaksim Pechnikov
2020-06-12Merge branch 'develop' into preload-dataMark Felder
2020-06-12Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsersEgor Kislitsyn
2020-06-11Merge OGP parser with TwitterCardEgor Kislitsyn
2020-06-08Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-06-03fix configstwf
2020-06-03Merge branch 'preload-data' of git.pleroma.social:stwf/pleroma into preload-datastwf
# Conflicts: # lib/pleroma/web/preload/status_net.ex
2020-06-03clean upstwf
2020-06-03add status_net/configstwf
2020-06-03preload data into index.htmlstwf
2020-06-03add status_net/configstwf