Commits · develop · marcin mikołajczak / pleroma

13 May, 2021 1 commit
- Merge remote-tracking branch 'bleroma/develop' into develop · 78c99da1
  root authored May 13, 2021
  
  78c99da1
04 May, 2021 2 commits

Merge branch 'dont-crash-email-settings' into 'develop' · 745375bd

feld authored May 04, 2021

Don't crash so hard when email settings are invalid

Closes #2606

See merge request pleroma/pleroma!3400

745375bd

Merge branch 'earmark' into 'develop' · d5263bfc

feld authored May 04, 2021

Upgrade Earmark to v1.4.15

Closes #1942 and #2026

See merge request pleroma/pleroma!3076

d5263bfc

03 May, 2021 3 commits
- CHANGELOG: don't crash so hard when email settings are invalid · 90770e08
  Alex Gleason authored May 03, 2021
  
  90770e08
- Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings · c186b059
  Alex Gleason authored May 03, 2021
  
  c186b059
- Don't crash when email settings are invalid · c80b1aaf
  Alex Gleason authored May 03, 2021
```
Fixes: #2606
Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/4
```
  c80b1aaf
01 May, 2021 1 commit
- CHANGELOG: markdown · dca87c5e
  Alex Gleason authored May 01, 2021
  
  dca87c5e
30 Apr, 2021 5 commits
- Merge remote-tracking branch 'upstream/develop' into earmark · 52fc59f1
  Alex Gleason authored Apr 30, 2021
  
  52fc59f1
- Fix failing remote mentions test, valid TLDs · a8fa00ef
  Alex Gleason authored Apr 30, 2021
  
  a8fa00ef
- Delete obsolete EarmarkRendereTests (moved to UtilsTest) · 53760d2c
  Alex Gleason authored Apr 30, 2021
  
  53760d2c
- Remove Pleroma.Formatter.minify/2 · 6727a365
  Alex Gleason authored Apr 30, 2021
  
  6727a365
- Upgrade Earmark 1.4.15 · 004bcedb
  Alex Gleason authored Apr 30, 2021
  
  004bcedb
29 Apr, 2021 6 commits
- Merge branch 'oauth-token-id' into 'develop' · 377f84f3
  feld authored Apr 29, 2021
```
Return token's primary key with POST /oauth/token

See merge request pleroma/pleroma!3380
```
  377f84f3
- Merge remote-tracking branch 'upstream/develop' into oauth-token-id · 6bc8ab22
  Alex Gleason authored Apr 29, 2021
  
  6bc8ab22
- Merge branch 'maybe-fix-ci' into 'develop' · 2fe3bd81
  feld authored Apr 29, 2021
```
CI: Purge pleroma build directory between runs

See merge request pleroma/pleroma!3399
```
  2fe3bd81
- CI: Purge pleroma build directory between runs · b5ae8268
  Alex Gleason authored Apr 29, 2021
  
  b5ae8268
- CHANGELOG: Return OAuth token `id` · 8c1d6e88
  Alex Gleason authored Apr 29, 2021
  
  8c1d6e88
- Merge remote-tracking branch 'upstream/develop' into oauth-token-id · e7ac1590
  Alex Gleason authored Apr 29, 2021
  
  e7ac1590
28 Apr, 2021 1 commit
- Merge branch 'gitlab-ci-mix-lock' into 'develop' · 115673bc
  Haelwenn authored Apr 28, 2021
```
Cache GitLab CI based on mix.lock

See merge request pleroma/pleroma!3398
```
  115673bc
27 Apr, 2021 1 commit
- Cache gitlab-ci based on mix.lock · b9a99ac0
  Alex Gleason authored Apr 27, 2021
  
  b9a99ac0
23 Apr, 2021 1 commit
- Merge branch 'fix/delete_activities_timeout' into 'develop' · d9e782c1
  Haelwenn authored Apr 23, 2021
```
Fix pleroma.user delete_activities mix task

See merge request pleroma/pleroma!3394
```
  d9e782c1
22 Apr, 2021 6 commits
- Fixed pleroma.user delete_activities mix task. · d7a71a27
  feld authored Apr 22, 2021
  
  d7a71a27
- Cleanup and ensure we obey custom Repo timeout · 959dc6e6
  feld authored Apr 22, 2021
  
  959dc6e6
- OTP releases executing commands via pleroma_ctl show the parent of the process is :erl_eval · 99fd9c5e
  feld authored Apr 20, 2021
  
  99fd9c5e
- Try to set query timeout intelligently · 9f711ddc
  feld authored Apr 20, 2021
  
  9f711ddc
- Add utility function to return infinite timeout for SQL transactions if we... · 9bc69196
  feld authored Apr 20, 2021
```
Add utility function to return infinite timeout for SQL transactions if we detect it was called from a Mix Task
```
  9bc69196
- Set Repo.transaction/2 timeout to infinity. Fixes pleroma.user delete_activities mix task. · 0effcd2c
  feld authored Apr 19, 2021
  
  0effcd2c
20 Apr, 2021 2 commits
- Merge branch 'fix/docs' into 'develop' · b050adb5
  feld authored Apr 20, 2021
```
Docs: Fix incorrect shell command

See merge request pleroma/pleroma!3396
```
  b050adb5
- Fix incorrect shell command · 7eded721
  feld authored Apr 20, 2021
```
Can't be in /opt/pleroma/bin and then call ./bin/pleroma_ctl :)
```
  7eded721
19 Apr, 2021 5 commits
- Merge branch 'feature/opt-out-of-google-floc' into 'develop' · 8defbe43
  feld authored Apr 19, 2021
```
Add opting out of Google FLoC to HTTPSecurityPlug headers

Closes #2630

See merge request pleroma/pleroma!3393
```
  8defbe43
- Add CHANGELOG entry · 2780cdd4
  Sean King authored Apr 19, 2021
  
  2780cdd4
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt-out-of-google-floc · d1eb1913
  Sean King authored Apr 19, 2021
  
  d1eb1913
- Merge branch 'fix/tests' into 'develop' · 7183655a
  feld authored Apr 19, 2021
```
Fix tests broken since !3312

See merge request pleroma/pleroma!3395
```
  7183655a
- Fix error response which was breaking tests related to pinned posts · efed94a2
  feld authored Apr 19, 2021
  
  efed94a2
18 Apr, 2021 1 commit
- Add opting out of Google FLoC to HTTPSecurityPlug headers · 2b4f958b
  Sean King authored Apr 18, 2021
  
  2b4f958b
16 Apr, 2021 3 commits
- Merge branch 'features/ingestion-ecto-tag' into 'develop' · 15f87cf6
  rinpatch authored Apr 16, 2021
```
TagValidator: New

See merge request pleroma/pleroma!3244
```
  15f87cf6
- Merge branch 'feature/521-pinned-post-federation' into 'develop' · 79376b4a
  rinpatch authored Apr 16, 2021
```
Pinned posts federation

Closes #521

See merge request pleroma/pleroma!3312
```
  79376b4a
- Merge branch 'fix/2593-reading-exported-config-file' into 'develop' · 0ababdc0
  rinpatch authored Apr 16, 2021
```
Reading the file, instead of config keyword in ReleaseRuntimeProvider

Closes #2593

See merge request pleroma/pleroma!3381
```
  0ababdc0
15 Apr, 2021 2 commits
- Merge branch 'fix/notifsettings-breaking-login' into 'develop' · 152cb307
  Haelwenn authored Apr 15, 2021
```
Enforce user.notification_settings is NOT NULL

Closes #2571

See merge request pleroma/pleroma!3386
```
  152cb307
- Merge branch 'develop' into 'fix/notifsettings-breaking-login' · 0a7c2a32
  feld authored Apr 15, 2021
```
# Conflicts:
#   CHANGELOG.md
```
  0a7c2a32