Commits · 8efacfed677ea2f06ac228294faec77a38060976 · Steven Fuchs / pleroma

Dec 13, 2019

Merge branch 'feature/federation-job-insert-connection-checkout' into 'develop' · 8efacfed
Haelwenn authored 5 years ago
```
Publisher: check out a connection for inserting publish_one jobs

See merge request pleroma/pleroma!2063
```
8efacfed

Publisher: check out a connection for inserting publish_one jobs · bcd16676

rinpatch authored 5 years ago

Related to #1474, federation of one post on my istance creates in
best-case 360 jobs, so if they for some reason take a while to insert,
it will exhaust the connection pool. This fixes it by checking out one
dedicated connection for inserting them.

bcd16676

Dec 12, 2019
- Merge branch 'feature/native-captcha' into 'develop' · 2f31cef7
  lain authored 5 years ago
  
  Add native captcha and enable it by default. Closes #1017 and #1405 See merge request pleroma/pleroma!2060
  2f31cef7
- Merge branch 'uguu' into 'develop' · 8ad6d278
  lain authored 5 years ago
  
  Update frontend See merge request pleroma/pleroma!2062
  8ad6d278
- Update frontend · 756a029e
  lain authored 5 years ago
  
  756a029e
- Merge branch '1427-oauth-graceful-admin-scope' into 'develop' · f44794d2
  lain authored 5 years ago
  
  [#1427] Graceful clearance of OAuth admin scopes for non-admin users Closes #1427 See merge request pleroma/pleroma!2061
  f44794d2
- [#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised). · 81b05340
  Ivan Tashkinov authored 5 years ago
  
  PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.
  81b05340
- Add Kocaptcha endpoint to the test config · 470a3a67
  minibikini authored 5 years ago
  
  470a3a67
- Add native captcha and enable it by default. · e5367969
  minibikini authored 5 years ago
  
  e5367969
- Merge branch 'revert-bca1512d ' into 'develop' · 79532a7f
  lain authored 5 years ago
  
  Revert "Merge branch 'admin-scope-support-code' into 'develop'" See merge request pleroma/pleroma!2059
  79532a7f
- Revert "Merge branch 'admin-scope-support-code' into 'develop'" · 27926727
  lain authored 5 years ago
  
  This reverts merge request !2055
  27926727
- Merge branch 'test-timeout' into 'develop' · 68a667a4
  lain authored 5 years ago
  
  Fix intermittent failures in federated testing See merge request pleroma/pleroma!2058
  68a667a4
- Merge branch 'feature/merge-acc-views-for-statuses' into 'develop' · 8cb85252
  lain authored 5 years ago
  
  AdminAPI: Merge account views for list instance statuses See merge request pleroma/pleroma!2054
  8cb85252
Dec 11, 2019
- Merge branch 'feature/report-notes' into 'develop' · 2aa609db
  feld authored 5 years ago
  
  AdminAPI: Add report notes See merge request pleroma/pleroma!2031
  2aa609db
- Merge branch 'develop' into feature/report-notes · 3ecf1315
  Maxim Filippov authored 5 years ago
  
  3ecf1315
- Merge branch 'issue/1411' into 'develop' · fd697cf2
  feld authored 5 years ago
  
  [#1411] /api/v1/favourites: added sorting for activites by adds to favorites See merge request pleroma/pleroma!1991
  fd697cf2
- Document the favorites timeline order change · 08670644
  feld authored 5 years ago
  
  08670644
- Merge branch 'develop' into issue/1411 · 9ef912ae
  feld authored 5 years ago
  
  9ef912ae
- try local sheduling · 63ffa0e3
  Steven Fuchs authored 5 years ago
  
  63ffa0e3
- Merge branch 'chore/fast_sanitize_bump' into 'develop' · 92b4a1aa
  rinpatch authored 5 years ago
  
  mix.lock: update fast_sanitize See merge request pleroma/pleroma!2056
  92b4a1aa
- mix.lock: update fast_sanitize · c01b3957
  rinpatch authored 5 years ago
  
  the new version uses html-spec compliant fragment parsing instead of just wrapping the fragment in the <body> tag.
  c01b3957
- Merge branch 'admin-scope-support-code' into 'develop' · bca1512d
  rinpatch authored 5 years ago
  
  FE bundle updates: admin-fe and pleroma-fe See merge request pleroma/pleroma!2055
  bca1512d
- Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f. · 84f0aec9
  Ivan Tashkinov authored 5 years ago
  
  84f0aec9
- AdminAPI: Merge account views for list instance statuses · 82fae3e2
  Maxim Filippov authored 5 years ago
  
  82fae3e2
- Merge branch 'domain-block-precedence' into 'develop' · 72f3b221
  rinpatch authored 5 years ago
  
  make follows take precedence over domain blocks See merge request pleroma/pleroma!2019
  72f3b221
- remove single-step pipe · 1ad96d66
  Sadposter authored 5 years ago
  
  1ad96d66
- Merge branch '1427-oauth-admin-scopes' into 'develop' · 1f498ba2
  lain authored 5 years ago
  
  [#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests Closes #1427 See merge request pleroma/pleroma!2053
  1f498ba2
- [#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests. · 3920244b
  Ivan Tashkinov authored 5 years ago
  
  3920244b
Dec 10, 2019
- Apply suggestion to lib/pleroma/user.ex · 457821ad
  Sadposter authored 5 years ago
  
  457821ad
- Merge branch 'fix/unsubscribe-route' into 'develop' · 67a478d7
  feld authored 5 years ago
  
  Do not apply http signature pipeline to the unsubscribe route See merge request pleroma/pleroma!2052
  67a478d7
- Merge branch 'develop' into 'domain-block-precedence' · 8cfaab8f
  Sadposter authored 5 years ago
  
  # Conflicts: # lib/pleroma/user.ex
  8cfaab8f
- make analysis happy · 5abee19b
  Sadposter authored 5 years ago
  
  5abee19b
- format activity_pub.ex · 25f774f7
  Sadposter authored 5 years ago
  
  25f774f7
- modify SQL to include followed-but-domain-blocked activities · 19d228cc
  Sadposter authored 5 years ago
  
  19d228cc
- Do not apply http signature pipeline to the unsubscribe route · 75b419d7
  minibikini authored 5 years ago
  
  75b419d7
- Merge branch '1427-oauth-admin-scopes' into 'develop' · aac0187e
  lain authored 5 years ago
  
  [#1427] OAuth admin scopes Closes #1427 See merge request pleroma/pleroma!2025
  aac0187e
- Merge branch 'develop' into '1427-oauth-admin-scopes' · 1ae976ac
  lain authored 5 years ago
  
  # Conflicts: # CHANGELOG.md
  1ae976ac
- Merge branch 'activitypub/configurable-activitypub-actor-type' into 'develop' · 54b1b2c9
  lain authored 5 years ago
  
  [ActivityPub] Configurable ActivityPub actor type See merge request pleroma/pleroma!2005
  54b1b2c9
- [ActivityPub] Configurable ActivityPub actor type · 701815e6
  Hakaba Hitoyo authored 5 years ago and lain committed 5 years ago
  
  701815e6
- Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes · 835ac215
  Ivan Tashkinov authored 5 years ago
  
  # Conflicts: # CHANGELOG.md
  835ac215