diff options
| author | kaniini <nenolod@gmail.com> | 2018-11-21 16:53:38 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-11-21 16:53:38 +0000 |
| commit | 182e3e8da2e5dbb8e8b7b514ad8bbdf242b37b59 (patch) | |
| tree | 01de30bed0bde252b8ee6398c34cbec987722a33 /config/config.exs | |
| parent | a591a044a9c4e0bef1190d7895c8aba11a4cd476 (diff) | |
| parent | bc5cf2c1926225a43589abf330fe984ea439cb00 (diff) | |
| download | pleroma-182e3e8da2e5dbb8e8b7b514ad8bbdf242b37b59.tar.gz pleroma-182e3e8da2e5dbb8e8b7b514ad8bbdf242b37b59.zip | |
Merge branch 'feature/improve-version' into 'develop'
Improved version string
See merge request pleroma/pleroma!467
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/config/config.exs b/config/config.exs index faeac8ed1..848c9d6cf 100644 --- a/config/config.exs +++ b/config/config.exs @@ -73,18 +73,10 @@ config :pleroma, :websub, Pleroma.Web.Websub config :pleroma, :ostatus, Pleroma.Web.OStatus config :pleroma, :httpoison, Pleroma.HTTP -version = - with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do - "Pleroma #{Mix.Project.config()[:version]} #{String.trim(version)}" - else - _ -> "Pleroma #{Mix.Project.config()[:version]} dev" - end - # Configures http settings, upstream proxy etc. config :pleroma, :http, proxy_url: nil config :pleroma, :instance, - version: version, name: "Pleroma", email: "example@example.com", description: "A Pleroma instance, an alternative fediverse server", |