Commits · d1a84ceec88ddd1bc2538cae8a4b6e72cde4fe6f · mfc / pleroma · GitLab

Snippets Groups Projects

Sep 16, 2019
- Merge branch 'feature/optimize_rich_media_parser' into 'develop' · d1a84cee
  kaniini authored 5 years ago
  d1a84cee
- Merge branch 'fix/race-in-tests' into 'develop' · 74eba5af
  kaniini authored 5 years ago
  74eba5af
- Fix a race condition in tests · ca88e37a
  minibikini authored 5 years ago
  
  ca88e37a
Sep 15, 2019
- Merge branch '1149-oban-job-queue' into 'develop' · 2990c0a5
  rinpatch authored 5 years ago
  2990c0a5
- added prepare html for RichMedia.Parser · b4cf74c1
  Maksim authored 5 years ago
  
  b4cf74c1
- [#1149] Reinstated docs/config.md changes. · 3b8ec98b
  Ivan Tashkinov authored 5 years ago
  
  3b8ec98b
- [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue · 610236d6
  Ivan Tashkinov authored 5 years ago
  610236d6
Sep 14, 2019
- Merge branch 'config-changes' into 'develop' · 9c64a257
  rinpatch authored 5 years ago
  9c64a257
- Merge branch 'fix/truncate-remote-user-fields' into 'develop' · 62bbba80
  rinpatch authored 5 years ago
  62bbba80
- [#1149] Rewritten readme as config/description.exs. · e127b9ab
  Ivan Tashkinov authored 5 years ago
  
  e127b9ab
- [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue · 6bcedb69
  Ivan Tashkinov authored 5 years ago
  6bcedb69
- Merge branch 'fix-tests' into 'develop' · 3ae448b5
  rinpatch authored 5 years ago
  3ae448b5
- Fix `Activity.all_by_actor_and_id/2` test · b870ae08
  minibikini authored 5 years ago
  
  b870ae08
- Merge branch 'security/fav-reblog-access-control' into 'develop' · 4264c4b7
  rinpatch authored 5 years ago
  4264c4b7
- Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs · a78a7ee4
  rinpatch authored 5 years ago
  
  a78a7ee4
- Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs · 85b6144f
  rinpatch authored 5 years ago
  
  85b6144f
Sep 13, 2019
- Mastodon API: Respect post privacy in favourited/reblogged endpoints · 5c5ebd38
  rinpatch authored 5 years ago
  
  5c5ebd38
- Merge branch 'capture-test-errors' into 'develop' · a9b78f55
  lain authored 5 years ago
  a9b78f55
- Merge branch 'refactor/add_link_headers' into 'develop' · 1be09bde
  lain authored 5 years ago
  1be09bde
- don't track generated_config.md · 4da0da9a
  Alexander Strizhakov authored 5 years ago
  
  4da0da9a
- config.md back · c625fe6f
  Alexander Strizhakov authored 5 years ago
  
  c625fe6f
- markdown generation to the new file · 69faec03
  Alexander Strizhakov authored 5 years ago
  
  69faec03
- Capture test error messages where appropriate · 25a64a4a
  Steven Fuchs authored 5 years ago
  
  25a64a4a
- Merge branch 'cleanup-activity' into 'develop' · 53a3ad60
  lain authored 5 years ago
  53a3ad60
- Merge branch 'feature/change-email' into 'develop' · 0d960989
  Haelwenn authored 5 years ago
  0d960989
- Merge branch 'admin-config-description' into 'develop' · f884987a
  rinpatch authored 5 years ago
  f884987a
- Add a note about compatibility with Mastodon · 7b5c81b3
  minibikini authored 5 years ago
  
  7b5c81b3
- Add email change endpoint · 25d82168
  minibikini authored 5 years ago
  
  25d82168
- Add more tests for Pleroma.Activity · 5bfbad13
  minibikini authored 5 years ago
  
  5bfbad13
- Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils · 39dc9b47
  minibikini authored 5 years ago
  
  39dc9b47
- Merge branch 'fix/admin-api-docs' into 'develop' · 5ca643b8
  kaniini authored 5 years ago
  5ca643b8
- Fix admin api docs for creating users · 528a88a6
  Angelina Filippova authored 5 years ago and kaniini committed 5 years ago
  
  528a88a6
Sep 12, 2019
- Merge branch 'fix/error-log-double-quotes' into 'develop' · 51609217
  Haelwenn authored 5 years ago
  51609217
- Fix associated test as well · 102eb445
  feld authored 5 years ago
  
  102eb445
Sep 11, 2019
- Fix double quotes in error logs · 74e4c72c
  feld authored 5 years ago
  74e4c72c
- Merge branch 'feature/jason-view-render' into 'develop' · 50269e9c
  kaniini authored 5 years ago
  50269e9c
- Use Jason for rendering responses · 56828abf
  rinpatch authored 5 years ago
  56828abf
- Merge branch 'patch-5' into 'develop' · 46ae62d1
  Haelwenn authored 5 years ago
  46ae62d1
- Merge branch 'fix/oom-parallel-rendering' into 'develop' · fb7332ae
  lain authored 5 years ago
  fb7332ae
- Add extended benchmark · 5a76d5d2
  rinpatch authored 5 years ago
  
  5a76d5d2