Properly merge subscriptions from different places

2026-11-15 06:33:55 +01:00 · 2018-05-22 10:05:08 +01:00
parent 5b3fbe47db
commit b1f378208d
12 changed files with 389 additions and 42 deletions
@@ -17,6 +17,7 @@ services:
      PROJECT_HISTORY_ENABLED: 'true'
      ENABLED_LINKED_FILE_TYPES: 'url'
      LINKED_URL_PROXY: 'http://localhost:6543'
+      SHARELATEX_CONFIG: /app/test/acceptance/config/settings.test.coffee
    depends_on:
      - redis
      - mongo