Commits · be6b57193a99a32134546efb667391eda4d4acdf · Pleroma / pleroma

21 May, 2019 3 commits
- Merge branch 'trivial/increase-hackney-timeouts' into 'develop' · be6b5719
  kaniini authored May 21, 2019
```
http: bump connection timeout to 10 seconds

See merge request pleroma/pleroma!1183
```
  be6b5719
- http: bump connection timeout to 10 seconds · c972d0bb
  kaniini authored May 21, 2019
  
  c972d0bb
- Merge branch 'fix/prometheus-ecto-error-when-not-configured' into 'develop' · 94caca92
  kaniini authored May 21, 2019
```
Fix prometheus-ecto error when not configured

Closes #917

See merge request !1180
```
  94caca92
20 May, 2019 12 commits
- Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop' · d4847b17
  kaniini authored May 20, 2019
```
Add virtual :thread_muted? field

Closes #901

See merge request pleroma/pleroma!1178
```
  d4847b17
- Fix prometheus-ecto error when not configured · f96e9b28
  Aaron Tinio authored May 21, 2019
  
  f96e9b28
- Merge branch 'feature/user-configurable-mascot' into 'develop' · 943d1b2f
  kaniini authored May 20, 2019
```
Feature: user configurable mascot

See merge request pleroma/pleroma!1177
```
  943d1b2f
- Merge branch 'doc/mrf-simple-report-removal' into 'develop' · 643b5634
  kaniini authored May 20, 2019
```
Document MRF.Simple :report_removal

See merge request pleroma/pleroma!1179
```
  643b5634
- Document MRF.Simple :report_removal · 5aa107d9
  Aaron Tinio authored May 21, 2019
  
  5aa107d9
- Add virtual :thread_muted? field · eb02edca
  Aaron Tinio authored May 21, 2019
```
that may be set when fetching activities
```
  eb02edca
- Move default mascot configuration to `config/` · daeae8e2
  Sadposter authored May 20, 2019
  
  daeae8e2
- Add changelog entry for mascot config · d8358106
  Sadposter authored May 20, 2019
  
  d8358106
- Use string map for default mascot · 3d0d9e7a
  Sadposter authored May 20, 2019
  
  3d0d9e7a
- Format mascot tests · dc916ba1
  Sadposter authored May 20, 2019
  
  dc916ba1
- Add mascot get/set tests · e81f0fc6
  Sadposter authored May 20, 2019
  
  e81f0fc6
- Add API endpoints for a custom user mascot · 54e9cb5c
  Sadposter authored May 20, 2019
  
  54e9cb5c
19 May, 2019 2 commits
- Merge branch 'feature/mrf-simple-report-filtering' into 'develop' · b30b51c3
  kaniini authored May 19, 2019
```
Add report filtering to MRF.SimplePolicy

Closes #610

See merge request pleroma/pleroma!1176
```
  b30b51c3
- Add report filtering to MRF.SimplePolicy · 2375e9a9
  Aaron Tinio authored May 20, 2019
  
  2375e9a9
18 May, 2019 2 commits
- Merge branch 'feature/mrf-always-nsfw' into 'develop' · 8e9a764d
  rinpatch authored May 18, 2019
```
suppress link previews from posts marked sensitive

Closes #865

See merge request pleroma/pleroma!1173
```
  8e9a764d
- Merge branch 'feature/http-ua-header-always' into 'develop' · cd7a6a25
  Haelwenn authored May 18, 2019
```
http: request builder: send user-agent when making requests

Closes #546

See merge request !1174
```
  cd7a6a25
17 May, 2019 21 commits
- add Changelog entry · c4a55e16
  kaniini authored May 17, 2019
  
  c4a55e16
- also suppress link previews from posts marked #nsfw · dc081595
  kaniini authored May 17, 2019
  
  dc081595
- add CHANGELOG entry · c234ce54
  kaniini authored May 17, 2019
  
  c234ce54
- config: make sending the user agent configurable, disable sending the user agent in tests · 290f5b2c
  kaniini authored May 17, 2019
  
  290f5b2c
- http: request builder: send user-agent when making requests · d3b8cd34
  kaniini authored May 17, 2019
  
  d3b8cd34
- rich media: suppress link previews if post is marked as sensitive · 0da1233e
  kaniini authored May 17, 2019
  
  0da1233e
- mrf: simple policy: mark all posts instead of posts with media as sensitive if... · 78588dbd
  kaniini authored May 17, 2019
```
mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw
```
  78588dbd
- Merge branch 'rum-index' into 'develop' · d2dacadb
  rinpatch authored May 17, 2019
```
Search: Use RUM index.

See merge request !1136
```
  d2dacadb
- CI: Use the correct image with the correct hostname. · ef63cf70
  lain authored May 17, 2019
  
  ef63cf70
- RUM: Set rum status by the environment. · 8784a7d1
  lain authored May 17, 2019
  
  8784a7d1
- RUM: Remove vacuum analyze from migration · 022e6e4b
  lain authored May 17, 2019
```
Can't be run in a trnasaction.
```
  022e6e4b
- CI: Add rum variant testing. · a3fc7294
  lain authored May 17, 2019
  
  a3fc7294
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index · 412a3d8a
  lain authored May 17, 2019
  
  412a3d8a
- Merge branch 'ecto_sql_update' into 'develop' · e5b34f5e
  lain authored May 17, 2019
```
Dependencies: Update Ecto SQL.

See merge request !1160
```
  e5b34f5e
- Merge branch 'update-tzdata' into 'develop' · 0498fa24
  lain authored May 17, 2019
```
Dependencies: Update tzdata.

Closes #910

See merge request !1171
```
  0498fa24
- Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop' · 1dcdcd88
  lain authored May 17, 2019
```
MastoAPI account_view.ex: requested is false when following is true

Closes #903

See merge request !1169
```
  1dcdcd88
- Update account_view.ex · 46684db8
  lain authored May 17, 2019
  
  46684db8
- Dependencies: Update tzdata. · 5743124c
  lain authored May 17, 2019
```
This fixes the bug that tz data could not be loaded. Closes #910.
```
  5743124c
- Fix specs. · 249b31ff
  lain authored May 17, 2019
  
  249b31ff
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update · 67af50ec
  lain authored May 17, 2019
  
  67af50ec
- Configuration: disable migration lock. · e39c190f
  lain authored May 17, 2019
  
  e39c190f