From 617e2f43ee06f099f05dd6f355a92e12114e178a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tao=20Bror=20Bojl=C3=A9n?= <tao@btao.org>
Date: Sun, 18 Aug 2019 18:14:58 +0200
Subject: [PATCH] release 2.7.0

---
 CHANGELOG.md              | 19 +++++++++++++++----
 backend/config/config.exs |  5 -----
 backend/mix.exs           |  2 +-
 frontend/package.json     |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6385c54..a9664ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,16 +11,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Cleaned up ElasticSearch configuration in backend.
-
 ### Deprecated
 
 ### Removed
 
-- Remove color-coding by activity per user.
-
 ### Fixed
 
+## [2.7.0 - 2018-08-18]
+
+### Added
+
+- Add Friendica crawler (only supports peers; there's no timeline API endpoint.)
+- Color more server types on the map -- Hubzilla, Plume, Pixelfed, and Wordpress.
+
+### Changed
+
+- Cleaned up ElasticSearch configuration in backend.
+
+### Removed
+
+- Remove color-coding by activity per user. The vast majority of instances had the exact same color so this wasn't very useful.
+
 ## [2.6.1 - 2019-08-10]
 
 ### Changed
diff --git a/backend/config/config.exs b/backend/config/config.exs
index d7e00ea..4d9ab63 100644
--- a/backend/config/config.exs
+++ b/backend/config/config.exs
@@ -20,11 +20,6 @@ config :backend, BackendWeb.Endpoint,
 
 config :backend, Backend.Repo, queue_target: 5000
 
-instances_config_path =
-  if System.get_env("MIX_ENV") == "prod",
-    do: "lib/backend-2.6.1/priv/elasticsearch/instances.json",
-    else: "priv/elasticsearch/instances.json"
-
 config :backend, Backend.Elasticsearch.Cluster,
   url: "http://localhost:9200",
   api: Elasticsearch.API.HTTP,
diff --git a/backend/mix.exs b/backend/mix.exs
index 9a2d1aa..c86b882 100644
--- a/backend/mix.exs
+++ b/backend/mix.exs
@@ -4,7 +4,7 @@ defmodule Backend.MixProject do
   def project do
     [
       app: :backend,
-      version: "2.6.1",
+      version: "2.7.0",
       elixir: "~> 1.5",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),
diff --git a/frontend/package.json b/frontend/package.json
index c36ca71..0925f35 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "2.6.1",
+  "version": "2.7.0",
   "private": true,
   "scripts": {
     "start": "NODE_ENV=development react-scripts start",