Return version in instance endpoint, set version to 0.9.0.

diff --git a/config/config.exs b/config/config.exs
index a7429fcdfcd4ba4d6a0898b5aef4bd166e1924cc..b41551895cf69e21d3adb0733c0796082094931a 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -39,9 +39,9 @@ config :pleroma, :ostatus, Pleroma.Web.OStatus
 config :pleroma, :httpoison, Pleroma.HTTP
 
 version = with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
-            "Pleroma #{String.trim(version)}"
+            "Pleroma #{Mix.Project.config[:version]} #{String.trim(version)}"
           else
-            _ -> "Pleroma dev"
+            _ -> "Pleroma #{Mix.Project.config[:version]} dev"
           end
 
 # Configures http settings, upstream proxy etc.

diff --git a/mix.exs b/mix.exs
index 7320ac543b7b9e476ef2a3e282e04027e1cafc27..6a518578d7e1ae4c4f39e5554d3e637663ac3005 100644 (file)
--- a/mix.exs
+++ b/mix.exs
@@ -3,7 +3,7 @@ defmodule Pleroma.Mixfile do
 
   def project do
     [app: :pleroma,
-     version: "0.0.1",
+     version: "0.9.0",
      elixir: "~> 1.4",
      elixirc_paths: elixirc_paths(Mix.env),
      compilers: [:phoenix, :gettext] ++ Mix.compilers,