Merge branch 'bump-to-master' into 'master'

masterにする

See merge request kanikosen/mastodon!140

docker-compose.yml

@@ -6,36 +6,13 @@ services:
     build:
       context: ./nginx
     volumes:
-<<<<<<< HEAD
       - /tmp/letsencrypt-webroot:/tmp/letsencrypt-webroot
       - /tmp/cache:/var/cache/nginx
       - /tmp/cache_temp:/tmp/nginx
     ports:
       - "80:80"
       - "443:443"
-=======
-      - ./redis:/data
-
-#  es:
-#    restart: always
-#    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.10
-#    environment:
-#      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-#      - "cluster.name=es-mastodon"
-#      - "discovery.type=single-node"
-#      - "bootstrap.memory_lock=true"
-#    networks:
-#      - internal_network
-#    healthcheck:
-#      test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
-#    volumes:
-#      - ./elasticsearch:/usr/share/elasticsearch/data
-#    ulimits:
-#      memlock:
-#        soft: -1
-#        hard: -1
-
->>>>>>> upstream/master
+  
   web:
     build: .
     image: tootsuite/mastodon

lib/mastodon/version.rb

@@ -33,19 +33,11 @@ module Mastodon
     end
 
     def repository
-<<<<<<< HEAD
       ENV.fetch('GITHUB_REPOSITORY') { 'kanikosen/mastodon' }
     end
 
     def source_base_url
       ENV.fetch('SOURCE_BASE_URL') { "https://gitlab.ejone.co/#{repository}" }
-=======
-      ENV.fetch('GITHUB_REPOSITORY', 'tootsuite/mastodon')
-    end
-
-    def source_base_url
-      ENV.fetch('SOURCE_BASE_URL', "https://github.com/#{repository}")
->>>>>>> upstream/master
     end
 
     # specify git tag or commit hash here