Merge branch 'develop' into styling/patch_fixes_for_theme_colors

app/javascript/gabsocial/features/ui/components/actions_modal.js

@@ -47,7 +47,7 @@ export default class ActionsModal extends ImmutablePureComponent {
             </a>
           </div>
 
-          <a href={`/${status.getIn(['account', 'acct'])}`} className='status__display-name'>
+          <a href={`/${this.props.status.getIn(['account', 'acct'])}`} className='status__display-name'>
             <div className='status__avatar'>
               <Avatar account={this.props.status.get('account')} size={48} />
             </div>

docker-compose.yml

@@ -1,15 +1,15 @@
 version: '3'
 services:
 
-  db:
+  # db:
-    restart: always
+  #   restart: always
-    image: postgres:9.6-alpine
+  #   image: postgres:9.6-alpine
-    networks:
+  #   networks:
-      - internal_network
+  #     - internal_network
-    healthcheck:
+  #   healthcheck:
-      test: ["CMD", "pg_isready", "-U", "postgres"]
+  #     test: ["CMD", "pg_isready", "-U", "postgres"]
-    volumes:
+  #   volumes:
-      - ./postgres:/var/lib/postgresql/data
+  #     - ./postgres:/var/lib/postgresql/data
 
   redis:
     restart: always
@@ -21,17 +21,17 @@ services:
     volumes:
       - ./redis:/data
 
-#  es:
+  # es:
-#    restart: always
+  #   restart: always
-#    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.1.3
+  #   image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.1.3
-#    environment:
+  #   environment:
-#      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+  #     - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-#    networks:
+  #   networks:
-#      - internal_network
+  #     - internal_network
-#    healthcheck:
+  #   healthcheck:
-#      test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
+  #     test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
-#    volumes:
+  #   volumes:
-#      - ./elasticsearch:/usr/share/elasticsearch/data
+  #     - ./elasticsearch:/usr/share/elasticsearch/data
 
   web:
     build: .
@@ -47,11 +47,11 @@ services:
     ports:
       - "127.0.0.1:3000:3000"
     depends_on:
-      - db
+      # - db
       - redis
-#      - es
+      # - es
     volumes:
-      - ./public/system:/gabsocial/public/system
+      - /mnt/md0/assets:/gabsocial/public/system
 
   streaming:
     build: .
@@ -83,7 +83,8 @@ services:
       - external_network
       - internal_network
     volumes:
-      - ./public/system:/gabsocial/public/system
+      - /mnt/md0/assets:/gabsocial/public/system
+
 ## Uncomment to enable federation with tor instances along with adding the following ENV variables
 ## http_proxy=http://privoxy:8118
 ## ALLOW_ACCESS_TO_HIDDEN_SERVICE=true