Commits · develop · Ivan Tashkinov / pleroma · GitLab

Snippets Groups Projects

Dec 04, 2019
- Merge branch 'fix_test' into 'develop' · 228bf4d2
  lain authored 5 years ago
  228bf4d2
- fix test · ed7f850a
  Maksim authored 5 years ago
  
  ed7f850a
Dec 02, 2019
- Merge branch 'feature/move-activity' into 'develop' · 7722e5a6
  lain authored 5 years ago
  7722e5a6
- Merge branch 'update-floki' into 'develop' · d468cba2
  rinpatch authored 5 years ago
  d468cba2
- Update Floki dependency · cf52106e
  minibikini authored 5 years ago
  
  cf52106e
Nov 30, 2019
- Merge branch 'remove-info-from-users' into 'develop' · 0d24ab04
  rinpatch authored 5 years ago
  0d24ab04
- Merge branch 'hide-relation-for-friendica' into 'develop' · cf0c861d
  rinpatch authored 5 years ago
  cf0c861d
- Merge branch 'benchmarks/favourites_timeline' into 'develop' · b21738d4
  rinpatch authored 5 years ago
  b21738d4
- test missing first field · 1915b23e
  kPherox authored 5 years ago
  
  1915b23e
- hide follower/following for friendica · 03266839
  kPherox authored 5 years ago
  
  03266839
Nov 29, 2019
- Merge branch 'fix/extract_first_external_url' into 'develop' · a990374e
  lain authored 5 years ago
  a990374e
- Fix Pleroma.HTML.extract_first_external_url/2 · a98cda77
  minibikini authored 5 years ago
  
  a98cda77
Nov 28, 2019
- Merge branch 'bugfix/1447-set-following' into 'develop' · d7b40dd4
  rinpatch authored 5 years ago
  d7b40dd4
- Merge branch 'chore/manual-benchmark' into 'develop' · ca1acfa3
  rinpatch authored 5 years ago
  ca1acfa3
- Merge branch 'use-pg12-in-ci' into 'develop' · 20564600
  lain authored 5 years ago
  20564600
- Use PosgreSQL v12 in the federated tests · 798aa0c3
  minibikini authored 5 years ago
  
  798aa0c3
- Migrations: Set users.following_count to NOT NULL · f0bdbe3f
  lain authored 5 years ago
  f0bdbe3f
- Merge branch 'fed-testing-updates' into 'develop' · 98990d2d
  lain authored 5 years ago
  98990d2d
- CI: Make benchmarks manually triggered. · 9a2d3810
  lain authored 5 years ago
  
  9a2d3810
- Merge branch 'cleanup-tests-output' into 'develop' · 8627fb0b
  lain authored 5 years ago
  8627fb0b
- Cleanup tests output · c4b468a9
  minibikini authored 5 years ago
  
  c4b468a9
Nov 27, 2019
- Merge branch 'bugfix/1442-dont-return-nil-for-following-count' into 'develop' · cb656938
  kaniini authored 5 years ago
  cb656938
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into... · 50b15276
  lain authored 5 years ago
  50b15276
- Merge branch 'remove-user-info' into 'develop' · ef1718a0
  lain authored 5 years ago
  ef1718a0
- User: Never return nil for user follower counts. · f36724ef
  lain authored 5 years ago
  
  f36724ef
- Remove User.user_info/2 · f595cfe6
  minibikini authored 5 years ago
  
  f595cfe6
- Add a view for the move notification · 1fc28a4b
  minibikini authored 5 years ago
  
  1fc28a4b
Nov 26, 2019
- update tests and Oban · bd1984f0
  Steven Fuchs authored 5 years ago
  
  bd1984f0
- Tests: Run the daemon · bbec9bb7
  lain authored 5 years ago and Steven Fuchs committed 5 years ago
  
  bbec9bb7
- CI: Add testing stage for federated tests. · 74aa4299
  lain authored 5 years ago and Steven Fuchs committed 5 years ago
  
  74aa4299
- Tests: Don't run federated tests by default · 717d2464
  lain authored 5 years ago and Steven Fuchs committed 5 years ago
  
  717d2464
- Add federated test infrastructure · f01881e8
  Chris McCord authored 5 years ago and Steven Fuchs committed 5 years ago
  
  f01881e8
- Merge branch 'feature/direct_conversation_id_web_push' into 'develop' · 139b1fed
  lain authored 5 years ago
  139b1fed
- Remove `account` field from web push payload · 4af69f04
  minibikini authored 5 years ago
  
  4af69f04
- Add `direct_conversation_id` to web push payload · 80ededc0
  minibikini authored 5 years ago
  
  80ededc0
- Merge branch 'fix/prod-syslog-level' into 'develop' · eb3c47f1
  feld authored 5 years ago
  eb3c47f1
- Default log level for syslog in prod should also be :warn · f673e3de
  feld authored 5 years ago
  
  f673e3de
Nov 25, 2019
- Merge branch 'fix/ap-disable-remote-render' into 'develop' · dc909081
  lain authored 5 years ago
  dc909081
- OStatus controller: don't serve json at /notice/, redirect instead · 4b10804f
  rinpatch authored 5 years ago
  
  4b10804f
- ActivityPub controller: do not render remote users · 02f73838
  rinpatch authored 5 years ago
  
  02f73838